Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
hg-git
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
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
Show more breadcrumbs
mercurial
hg-git
Commits
0e0a2d20
Commit
0e0a2d20
authored
15 years ago
by
Scott Chacon
Browse files
Options
Downloads
Patches
Plain Diff
added a missing newline back to git conversion
parent
7b4cf18c
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
TODO.txt
+2
-3
2 additions, 3 deletions
TODO.txt
git_handler.py
+2
-2
2 additions, 2 deletions
git_handler.py
with
4 additions
and
5 deletions
TODO.txt
+
2
−
3
View file @
0e0a2d20
...
...
@@ -5,7 +5,6 @@
- hg fetch [remote] (remote is url, hg alias or hg-git remote)
- hg clone url
* fail nicely when the remote_name is not there
* more tests
* submodules?
* .gitignore, etc - try to convert?
- (probably not automatically, but perhaps a generator?)
...
...
@@ -24,8 +23,8 @@
MAPPING ISSUES
==============
Created in Hg:
*
na
med branch
es #
* merges with renames
- dont convert back properly for some reason
* me
rges with renames in 2n
d branch
- dont convert back properly for some reason
Created in Git:
* different committer in Git objects
...
...
This diff is collapsed.
Click to expand it.
git_handler.py
+
2
−
2
View file @
0e0a2d20
...
...
@@ -201,7 +201,7 @@
author
=
author
+
'
<none@none>
'
commit
[
'
author
'
]
=
author
+
'
'
+
str
(
int
(
time
))
+
'
'
+
seconds_to_offset
(
timezone
)
message
=
ctx
.
description
()
commit
[
'
message
'
]
=
ctx
.
description
()
commit
[
'
message
'
]
=
ctx
.
description
()
+
"
\n
"
# HG EXTRA INFORMATION
add_extras
=
False
...
...
@@ -216,7 +216,7 @@
extra_message
+=
"
rename :
"
+
oldfile
+
"
=>
"
+
newfile
+
"
\n
"
if
add_extras
:
commit
[
'
message
'
]
+=
"
\n
\n
--HG--
\n
"
+
extra_message
commit
[
'
message
'
]
+=
"
\n
--HG--
\n
"
+
extra_message
commit
[
'
parents
'
]
=
[]
for
parent
in
parents
:
...
...
This diff is collapsed.
Click to expand it.
Felipe Contreras
@felipec
mentioned in merge request
mercurial-devel!486 (closed)
·
2 years ago
mentioned in merge request
mercurial-devel!486 (closed)
mentioned in merge request mercurial-devel!486
Toggle commit list
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