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
87d462a6
Commit
87d462a6
authored
15 years ago
by
Scott Chacon
Browse files
Options
Downloads
Patches
Plain Diff
pushing nothing works better
parent
1421d04f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
TODO.txt
+2
-12
2 additions, 12 deletions
TODO.txt
dulwich/client.py
+1
-1
1 addition, 1 deletion
dulwich/client.py
git_handler.py
+9
-7
9 additions, 7 deletions
git_handler.py
with
12 additions
and
20 deletions
TODO.txt
+
2
−
12
View file @
87d462a6
...
...
@@ -2,6 +2,7 @@
==========
* respect file modes on conversions
* explicit file renames
* integrate as native protocol handler (hg push git://...)
* more tests
* submodules?
* .gitignore, etc - try to convert?
...
...
@@ -9,11 +10,4 @@
PUSH
==========
Getting (and not sure why):
error: Ref refs/heads/master is at 093772e7fa2ee3c0d488bc44317cfe66d72f09ed
but expected a89be0ca4c09782b6275a8e826c11a91b860a071
error: failed to lock refs/heads/master
(it works, but why is it doing this?)
* push with branch names (w/ proper error messages)
...
...
@@ -19,10 +13,7 @@
* push with branch names (w/ proper error messages)
* update 'remote' references after push confirmation
* push confirmation? is there extra data after the packfile upload?
* output something after process is complete (master -> master etc)
- explain what branch mapping policy determined
* explain what branch mapping policy determined when updating refs
* convert tags to git
* octopus merge explode re-implode
FETCH
===========
...
...
@@ -24,9 +15,8 @@
* convert tags to git
* octopus merge explode re-implode
FETCH
===========
* add removed files to filechanged and raise IOError
* gfetch command
* only try to import non-mapped commits
* tag conversion
...
...
This diff is collapsed.
Click to expand it.
dulwich/client.py
+
1
−
1
View file @
87d462a6
...
...
@@ -118,7 +118,7 @@
if
not
changed_refs
:
print
'
nothing changed
'
self
.
proto
.
write_pkt_line
(
None
)
return
return
None
return_refs
=
copy
.
copy
(
changed_refs
)
want
=
[]
...
...
This diff is collapsed.
Click to expand it.
git_handler.py
+
9
−
7
View file @
87d462a6
...
...
@@ -172,7 +172,7 @@
if
pgit_sha
:
return
pgit_sha
print
"
converting revision
"
+
str
(
rev
)
self
.
ui
.
status
(
"
converting revision
"
+
str
(
rev
)
)
# make sure parents are converted first
parents
=
self
.
repo
.
parents
(
rev
)
...
...
@@ -286,4 +286,5 @@
changed
=
self
.
get_changed_refs
genpack
=
self
.
generate_pack_contents
try
:
self
.
ui
.
status
(
"
creating and sending data
\n
"
)
changed_refs
=
client
.
send_pack
(
path
,
changed
,
genpack
)
...
...
@@ -289,10 +290,11 @@
changed_refs
=
client
.
send_pack
(
path
,
changed
,
genpack
)
new_refs
=
{}
for
old
,
new
,
ref
in
changed_refs
:
self
.
ui
.
status
(
"
"
+
remote_name
+
"
::
"
+
ref
+
"
: GIT:
"
+
old
[
0
:
8
]
+
"
=> GIT:
"
+
new
[
0
:
8
]
+
"
\n
"
)
new_refs
[
ref
]
=
new
self
.
git
.
set_remote_refs
(
new_refs
,
remote_name
)
self
.
update_hg_bookmarks
(
remote_name
)
if
changed_refs
:
new_refs
=
{}
for
old
,
new
,
ref
in
changed_refs
:
self
.
ui
.
status
(
"
"
+
remote_name
+
"
::
"
+
ref
+
"
: GIT:
"
+
old
[
0
:
8
]
+
"
=> GIT:
"
+
new
[
0
:
8
]
+
"
\n
"
)
new_refs
[
ref
]
=
new
self
.
git
.
set_remote_refs
(
new_refs
,
remote_name
)
self
.
update_hg_bookmarks
(
remote_name
)
except
:
raise
...
...
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