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
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
mercurial
hg-git
Commits
2a5c0bf0fef5
Commit
2a5c0bf0fef5
authored
15 years ago
by
Augie Fackler
Browse files
Options
Downloads
Patches
Plain Diff
Another way of fixing no-bookmark issue, along with updated test.
parent
b258ef16ae37
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
git_handler.py
+5
-1
5 additions, 1 deletion
git_handler.py
tests/test-sane-without-bookmarks.out
+3
-1
3 additions, 1 deletion
tests/test-sane-without-bookmarks.out
with
8 additions
and
2 deletions
git_handler.py
+
5
−
1
View file @
2a5c0bf0
...
...
@@ -320,7 +320,11 @@
hgsha
=
hex_to_sha
(
self
.
map_hg_get
(
sha
))
if
not
head
==
'
HEAD
'
:
bms
[
remote_name
+
'
/
'
+
head
]
=
hgsha
bookmarks
.
write
(
self
.
repo
,
bms
)
try
:
bookmarks
.
write
(
self
.
repo
,
bms
)
except
AttributeError
:
self
.
repo
.
ui
.
warn
(
'
creating bookmarks failed, do you have
'
'
bookmarks enabled?
\n
'
)
def
import_git_commit
(
self
,
commit
):
print
"
importing:
"
+
commit
.
id
...
...
This diff is collapsed.
Click to expand it.
tests/test-sane-without-bookmarks.out
+
3
−
1
View file @
2a5c0bf0
Initialized empty Git repository in gitrepo/.git/
fetching from : origin
exporting git objects
Counting objects: 6, done.
Compressing objects: 33% (1/3) Compressing objects: 66% (2/3) Compressing objects: 100% (3/3) Compressing objects: 100% (3/3), done.
Total 6 (delta 0), reused 0 (delta 0)
importing Git objects into Hg
importing: 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03
importing: 9497a4ee62e16ee641860d7677cdb2589ea15554
...
...
@@ -4,10 +5,11 @@
Counting objects: 6, done.
Compressing objects: 33% (1/3) Compressing objects: 66% (2/3) Compressing objects: 100% (3/3) Compressing objects: 100% (3/3), done.
Total 6 (delta 0), reused 0 (delta 0)
importing Git objects into Hg
importing: 7eeab2ea75ec1ac0ff3d500b5b6f8a3447dd7c03
importing: 9497a4ee62e16ee641860d7677cdb2589ea15554
bookmarks are not enabled, not writing them out!2 files updated, 0 files merged, 0 files removed, 0 files unresolved
creating bookmarks failed, do you have bookmarks enabled?
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ changeset: 1:7bcd915dc873
| tag: tip
| user: test <test@example.org>
...
...
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