Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
hg-pull-mirror-test2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
This instance will be upgraded to Heptapod 17.9.0rc1 on 2025-03-27 between 17:00 and 18:00 UTC+2
Show more breadcrumbs
heptapod
Testing Projects
hg-pull-mirror-test2
Commits
a7248da55467
Commit
a7248da55467
authored
17 years ago
by
Bryan O'Sullivan
Browse files
Options
Downloads
Plain Diff
Merge with -stable.
parents
52d6feb62692
07bdb5e5d08c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
hgext/convert/__init__.py
+9
-7
9 additions, 7 deletions
hgext/convert/__init__.py
mercurial/diffhelpers.c
+6
-0
6 additions, 0 deletions
mercurial/diffhelpers.c
with
15 additions
and
7 deletions
hgext/convert/__init__.py
+
9
−
7
View file @
a7248da5
...
...
@@ -299,6 +299,7 @@
"""
Convert a foreign SCM repository to a Mercurial one.
Accepted source formats:
- Mercurial
- CVS
- Darcs
- git
...
...
@@ -315,8 +316,8 @@
basename of the source with
'
-hg
'
appended. If the destination
repository doesn
'
t exist, it will be created.
If <
revmapfile
> isn
'
t given, it will be put in a default location
(<dest>/.hg/shamap by default). The <
revmapfile
> is a simple text
If <
MAPFILE
> isn
'
t given, it will be put in a default location
(<dest>/.hg/shamap by default). The <
MAPFILE
> is a simple text
file that maps each source commit ID to the destination ID for
that revision, like so:
<source ID> <destination ID>
...
...
@@ -342,11 +343,12 @@
rename from/file to/file
The
'
include
'
directive causes a file, or all files under a
directory, to be included in the destination repository. The
'
exclude
'
directive causes files or directories to be omitted.
The
'
rename
'
directive renames a file or directory. To rename
from a subdirectory into the root of the repository, use
'
.
'
as
the path to rename to.
directory, to be included in the destination repository, and the
exclussion of all other files and dirs not explicitely included.
The
'
exclude
'
directive causes files or directories to be omitted.
The
'
rename
'
directive renames a file or directory. To rename from a
subdirectory into the root of the repository, use
'
.
'
as the path to
rename to.
"""
util
.
_encoding
=
'
UTF-8
'
...
...
This diff is collapsed.
Click to expand it.
mercurial/diffhelpers.c
+
6
−
0
View file @
a7248da5
...
...
@@ -83,6 +83,12 @@
_fix_newline
(
hunk
,
a
,
b
);
continue
;
}
if
(
c
==
'\n'
)
{
/* Some patches may be missing the control char
* on empty lines. Supply a leading space. */
Py_DECREF
(
x
);
x
=
PyString_FromString
(
"
\n
"
);
}
PyList_Append
(
hunk
,
x
);
if
(
c
==
'+'
)
{
l
=
PyString_FromString
(
s
+
1
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment