facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 08:47:12 +03:00
Code Issues Projects Releases Wiki Activity
d7b4c70b92
sapling/tests/test-push.t

204 lines
5.5 KiB
Perl
Raw Normal View History

tests: extract extension configuration into a testutil library Thanks to Felipe Contreras for the patch which this was based on. Even though the MQ extension was only used in a single test (test-pull-after-strip.t), I included it in the testutil. It shouldn't hurt anything to have it enabled and not used, and saves us from having to deal with enabling extensions in individual tests at all. Similarly, this changeset results in the graphlog extension being enabled for all tests, even though there were some that didn't use it before. This is even less significant in Mercurial 2.3+, since in those versions, graphlog is part of core, and is available even when the extension is disabled.
2012-10-31 04:03:26 +04:00
Load commonly used test logic
$ . "$TESTDIR/testutil"
tests: let git init create directories when applicable It's functionally equivalent to create a directory, cd into it, git init, and cd out of the directory, or simply git init with the directory specified. In several cases, we were doing the former without performing any other operations in the git repo, which just made the test unneccesarily complex. Even in the case where we still want to cd into the directory, calling git init with the directory name eliminates the need for a separate mkdir command. This changeset converts the former approach to the latter with the goal of increasing the readability of the tests. Thanks to Felipe Contreras for the patch which this was based on.
2012-10-31 08:01:03 +04:00
$ git init gitrepo
tests: remove piping of command git init to remove leading path In many cases we were piping to a python script to strip out the varying leading path to the test repos. This is no longer needed, as the modern run-test.py automatically substitutes the leading path as $TESTTMP. Eliminating the piping makes the tests easier to read and write, as well as allowing the exit codes to be verified by the test.
2012-09-14 04:49:42 +04:00
Initialized empty Git repository in $TESTTMP/gitrepo/.git/
tests: let git init create directories when applicable It's functionally equivalent to create a directory, cd into it, git init, and cd out of the directory, or simply git init with the directory specified. In several cases, we were doing the former without performing any other operations in the git repo, which just made the test unneccesarily complex. Even in the case where we still want to cd into the directory, calling git init with the directory name eliminates the need for a separate mkdir command. This changeset converts the former approach to the latter with the goal of increasing the readability of the tests. Thanks to Felipe Contreras for the patch which this was based on.
2012-10-31 08:01:03 +04:00
$ cd gitrepo
tests: unify test-push
2012-09-10 08:27:45 +04:00
$ echo alpha > alpha
$ git add alpha
tests: extract commonly used commit/tag functions into testutil library Thanks to Felipe Contreras for the patch which this was based on. The functions were renamed to make it clearer that these are shell functions rather than normal git/hg commands, and to make it clearer which tool is being invoked. Old name | New name ------------------------ commit | fn_git_commit tag | fn_git_tag hgcommit | fn_hg_commit hgtag | fn_hg_tag Extraction from test-encoding.t was left for a subsequent patch, as I was seeing unexpected output changes when I attempted the extraction. The gitcommit and hgcommit functions in test-bookmark-workflow.t were left as-is for now, as they have a different behavior than the standard version (separate counters for each).
2012-10-31 06:59:20 +04:00
$ fn_git_commit -m "add alpha"
tests: unify test-push
2012-09-10 08:27:45 +04:00
$ git checkout -b not-master 2>&1 | sed s/\'/\"/g
Switched to a new branch "not-master"
$ cd ..
tests: eliminate use of git-daemon Dulwich now supports local repositories just fine. Not using the daemon makes the tests easier to read and more reliable (less likely to be skipped because a stray daemon is holding onto the port).
2012-09-14 04:49:45 +04:00
$ hg clone gitrepo hgrepo | grep -v '^updating'
tests: unify test-push
2012-09-10 08:27:45 +04:00
importing git objects into hg
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd hgrepo
$ echo beta > beta
$ hg add beta
tests: extract commonly used commit/tag functions into testutil library Thanks to Felipe Contreras for the patch which this was based on. The functions were renamed to make it clearer that these are shell functions rather than normal git/hg commands, and to make it clearer which tool is being invoked. Old name | New name ------------------------ commit | fn_git_commit tag | fn_git_tag hgcommit | fn_hg_commit hgtag | fn_hg_tag Extraction from test-encoding.t was left for a subsequent patch, as I was seeing unexpected output changes when I attempted the extraction. The gitcommit and hgcommit functions in test-bookmark-workflow.t were left as-is for now, as they have a different behavior than the standard version (separate counters for each).
2012-10-31 06:59:20 +04:00
$ fn_hg_commit -m 'add beta'
tests: unify test-push
2012-09-10 08:27:45 +04:00
$ echo gamma > gamma
$ hg add gamma
tests: extract commonly used commit/tag functions into testutil library Thanks to Felipe Contreras for the patch which this was based on. The functions were renamed to make it clearer that these are shell functions rather than normal git/hg commands, and to make it clearer which tool is being invoked. Old name | New name ------------------------ commit | fn_git_commit tag | fn_git_tag hgcommit | fn_hg_commit hgtag | fn_hg_tag Extraction from test-encoding.t was left for a subsequent patch, as I was seeing unexpected output changes when I attempted the extraction. The gitcommit and hgcommit functions in test-bookmark-workflow.t were left as-is for now, as they have a different behavior than the standard version (separate counters for each).
2012-10-31 06:59:20 +04:00
$ fn_hg_commit -m 'add gamma'
tests: unify test-push
2012-09-10 08:27:45 +04:00
$ hg book -r 1 beta
$ hg push -r beta
tests: eliminate use of git-daemon Dulwich now supports local repositories just fine. Not using the daemon makes the tests easier to read and more reliable (less likely to be skipped because a stray daemon is holding onto the port).
2012-09-14 04:49:45 +04:00
pushing to $TESTTMP/gitrepo
push: change "no changes" default output to match normal mercurial The output for "hg push" when there were no changes didn't quite match between Mercurial with and without Hg-Git, so I changed the behavior to bring it into synch. The existing "creating and sending data" message was changed to be included if --verbose is specified.
2012-10-08 04:11:27 +04:00
searching for changes
push: add more output about what was added (issue #64) l33t pointed out that currently, Hg-Git doesn't provide any confirmation that a push was successful other than the exit code. Normal Mercurial provides a couple other messages followed by "added X changesets with Y changes to Z files". After this change, Hg-Git will provide much more similar output. It's not identical, as the underlying model is substantially different, but the concept is the same. The main message is "added X commits with Y trees and Z blobs". This change doesn't affect the output of what references/branches were touched. That will be addressed in a subsequent commit. Dulwich doesn't provide an easy hook to get the information needed for this output. Instead of passing generate_pack_contents as the pack generator function to send_pack, I pass a custom function that determines the "missing" objects, stores the counts, and then calls generate_pack_contents (which then will determine the "missing" objects again. The new expected output: searching for changes # unless quiet true <N> commits found # if verbose true list of commits: # if debugflag true and at least one commit found <each hash> # if debugflag true and at least one commit found adding objects # if at least one commit found unless quiet true added <N> commits with <N> trees and <N> blobs # if at least one object unless # quiet true https://bitbucket.org/durin42/hg-git/issue/64/push-confirmation
2013-01-06 10:46:57 +04:00
adding objects
tests: dulwich is now smarter about sending fewer objects, update output
2013-12-13 21:41:41 +04:00
added 1 commits with 1 trees and 1 blobs
push: provide better output about changed references (issue #64) As pointed out by l33t, Hg-Git's output for push doesn't currently do a very good job of telling the user what happened. My previous changes in this area had moved some of the output from status to note, making it only show if --verbose was specified. However, I hadn't realized at the time that the reference information (though overly verbose) was providing a valueable purpose that otherwise wasn't met; telling the user that a remote reference had changed. This changeset makes it so that: * default output will include simple messages like "adding reference refs/heads/feature" and "updating reference refs/heads/master" (omitting any mention of unchanged references) * verbose output will include more detailed messages like "adding reference default::refs/heads/feature => GIT:aba43c" and "updating reference default::refs/heads/master => GIT:aba43c" (omitting any mention of unchanged references) * debug output will include the detailed output like in verbose, but addtionally will include messages like "unchanged reference default::refs/heads/other => GIT:aba43c" https://bitbucket.org/durin42/hg-git/issue/64/push-confirmation
2013-01-06 11:31:37 +04:00
adding reference refs/heads/beta
tests: unify test-push
2012-09-10 08:27:45 +04:00
$ cd ..
tests: convert echos to comments Now that we're in the unified test format, there isn't a need to use echo to provide context to command output. This technique actually ends up resulting in redundant output. To preserve the original context, but eliminate the redundancy, such echo statements have been converted into comment lines.
2012-11-04 03:14:17 +04:00
should have two different branches
tests: unify test-push
2012-09-10 08:27:45 +04:00
$ cd gitrepo
$ git branch -v
git_handler: mark source for rename info as Git or Mercurial See inline comments for why the additional metadata needs to be stored. This literally breaks all the hashes because of the additional metadata. The changing of hashes is unfortunate but necessary to preserve bidirectionality. While this could be broken up into multiple commits, there was no way to do that while preserving bidirectionality. Following the principle that every intermediate commit must result in a correct state, I decided to combine the commits.
2014-12-03 01:17:09 +03:00
beta 0f378ab add beta
tests: unify test-push
2012-09-10 08:27:45 +04:00
master 7eeab2e add alpha
* not-master 7eeab2e add alpha
tests: convert echos to comments Now that we're in the unified test format, there isn't a need to use echo to provide context to command output. This technique actually ends up resulting in redundant output. To preserve the original context, but eliminate the redundancy, such echo statements have been converted into comment lines.
2012-11-04 03:14:17 +04:00
some more work on master from git
tests: unify test-push
2012-09-10 08:27:45 +04:00
$ git checkout master 2>&1 | sed s/\'/\"/g
Switched to branch "master"
$ echo delta > delta
$ git add delta
tests: extract commonly used commit/tag functions into testutil library Thanks to Felipe Contreras for the patch which this was based on. The functions were renamed to make it clearer that these are shell functions rather than normal git/hg commands, and to make it clearer which tool is being invoked. Old name | New name ------------------------ commit | fn_git_commit tag | fn_git_tag hgcommit | fn_hg_commit hgtag | fn_hg_tag Extraction from test-encoding.t was left for a subsequent patch, as I was seeing unexpected output changes when I attempted the extraction. The gitcommit and hgcommit functions in test-bookmark-workflow.t were left as-is for now, as they have a different behavior than the standard version (separate counters for each).
2012-10-31 06:59:20 +04:00
$ fn_git_commit -m "add delta"
tests: unify test-push
2012-09-10 08:27:45 +04:00
$ git checkout not-master 2>&1 | sed s/\'/\"/g
Switched to branch "not-master"
$ cd ..
$ cd hgrepo
tests: convert echos to comments Now that we're in the unified test format, there isn't a need to use echo to provide context to command output. This technique actually ends up resulting in redundant output. To preserve the original context, but eliminate the redundancy, such echo statements have been converted into comment lines.
2012-11-04 03:14:17 +04:00
this should fail
tests: unify test-push
2012-09-10 08:27:45 +04:00
$ hg push -r master
tests: eliminate use of git-daemon Dulwich now supports local repositories just fine. Not using the daemon makes the tests easier to read and more reliable (less likely to be skipped because a stray daemon is holding onto the port).
2012-09-14 04:49:45 +04:00
pushing to $TESTTMP/gitrepo
push: change "no changes" default output to match normal mercurial The output for "hg push" when there were no changes didn't quite match between Mercurial with and without Hg-Git, so I changed the behavior to bring it into synch. The existing "creating and sending data" message was changed to be included if --verbose is specified.
2012-10-08 04:11:27 +04:00
searching for changes
tests: fix output expectations from 3ff09f0
2013-12-16 00:25:31 +04:00
abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing
tests: unify test-push
2012-09-10 08:27:45 +04:00
[255]
tests: convert echos to comments Now that we're in the unified test format, there isn't a need to use echo to provide context to command output. This technique actually ends up resulting in redundant output. To preserve the original context, but eliminate the redundancy, such echo statements have been converted into comment lines.
2012-11-04 03:14:17 +04:00
... even with -f
tests: unify test-push
2012-09-10 08:27:45 +04:00
$ hg push -fr master
tests: eliminate use of git-daemon Dulwich now supports local repositories just fine. Not using the daemon makes the tests easier to read and more reliable (less likely to be skipped because a stray daemon is holding onto the port).
2012-09-14 04:49:45 +04:00
pushing to $TESTTMP/gitrepo
push: change "no changes" default output to match normal mercurial The output for "hg push" when there were no changes didn't quite match between Mercurial with and without Hg-Git, so I changed the behavior to bring it into synch. The existing "creating and sending data" message was changed to be included if --verbose is specified.
2012-10-08 04:11:27 +04:00
searching for changes
tests: fix output expectations from 3ff09f0
2013-12-16 00:25:31 +04:00
abort: branch 'refs/heads/master' changed on the server, please pull and merge before pushing
tests: unify test-push
2012-09-10 08:27:45 +04:00
[255]
gitrepo: initial support for listkeys This changeset adds test coverage for comparing "hg outgoing -B" in normal Mercurial usage with Hg-Git usage. This didn't match, since previously, gitrepo didn't provide a meaningful listkeys implementation. Now, it does. gitrepo now has access to a GitHandler when a localrepo is available. This handler is used to access the information needed to implement listkeys for namespaces (currently, only bookmarks) and bookmarks. A couple of other tests were testing "divergent bookmark" scenarios. These tests have been updated to filter out the divergent bookmark output, as it isn't consistent across the supported Mercurial versions.
2012-10-26 04:49:08 +04:00
$ hg pull 2>&1 | grep -v 'divergent bookmark'
tests: eliminate use of git-daemon Dulwich now supports local repositories just fine. Not using the daemon makes the tests easier to read and more reliable (less likely to be skipped because a stray daemon is holding onto the port).
2012-09-14 04:49:45 +04:00
pulling from $TESTTMP/gitrepo
tests: unify test-push
2012-09-10 08:27:45 +04:00
importing git objects into hg
git_handler.fetch: actually return number of heads added or removed The return value as implemented in git_handler.fetch was pretty bogus. It used to return the number of values that changed in the 'refs/heads/' namespace, regardless of whether multiple values in there point to the same Mercurial commit, or whether particular heads were even imported. Fix all of that by using the actual heads in the changelog, just like vanilla Mercurial. The test output changes demonstrate examples where the code was buggy.
2014-03-05 04:05:19 +04:00
(run 'hg heads' to see heads, 'hg merge' to merge)
tests: unify test-push
2012-09-10 08:27:45 +04:00
TODO shouldn't need to do this since we're (in theory) pushing master explicitly,
which should not implicitly also push the not-master ref.
$ hg book not-master -r default/not-master --force
tests: convert echos to comments Now that we're in the unified test format, there isn't a need to use echo to provide context to command output. This technique actually ends up resulting in redundant output. To preserve the original context, but eliminate the redundancy, such echo statements have been converted into comment lines.
2012-11-04 03:14:17 +04:00
master and default/master should be diferent
tests: stop filtering out bookmark output The bookmark output has been stable since well before the oldest Mercurial we support, 2.8.
2015-03-12 20:29:58 +03:00
$ hg log -r master
git_handler: mark source for rename info as Git or Mercurial See inline comments for why the additional metadata needs to be stored. This literally breaks all the hashes because of the additional metadata. The changing of hashes is unfortunate but necessary to preserve bidirectionality. While this could be broken up into multiple commits, there was no way to do that while preserving bidirectionality. Following the principle that every intermediate commit must result in a correct state, I decided to combine the commits.
2014-12-03 01:17:09 +03:00
changeset: 2:953796e1cfd8
tests: stop filtering out bookmark output The bookmark output has been stable since well before the oldest Mercurial we support, 2.8.
2015-03-12 20:29:58 +03:00
bookmark: master
tests: unify test-push
2012-09-10 08:27:45 +04:00
user: test
date: Mon Jan 01 00:00:12 2007 +0000
summary: add gamma
tests: stop filtering out bookmark output The bookmark output has been stable since well before the oldest Mercurial we support, 2.8.
2015-03-12 20:29:58 +03:00
$ hg log -r default/master
git_handler: mark source for rename info as Git or Mercurial See inline comments for why the additional metadata needs to be stored. This literally breaks all the hashes because of the additional metadata. The changing of hashes is unfortunate but necessary to preserve bidirectionality. While this could be broken up into multiple commits, there was no way to do that while preserving bidirectionality. Following the principle that every intermediate commit must result in a correct state, I decided to combine the commits.
2014-12-03 01:17:09 +03:00
changeset: 3:25eed24f5e8f
tests: unify test-push
2012-09-10 08:27:45 +04:00
tag: default/master
tag: tip
git_handler: mark source for rename info as Git or Mercurial See inline comments for why the additional metadata needs to be stored. This literally breaks all the hashes because of the additional metadata. The changing of hashes is unfortunate but necessary to preserve bidirectionality. While this could be broken up into multiple commits, there was no way to do that while preserving bidirectionality. Following the principle that every intermediate commit must result in a correct state, I decided to combine the commits.
2014-12-03 01:17:09 +03:00
parent: 0:ff7a2f2d8d70
tests: unify test-push
2012-09-10 08:27:45 +04:00
user: test <test@example.org>
date: Mon Jan 01 00:00:13 2007 +0000
summary: add delta
tests: convert echos to comments Now that we're in the unified test format, there isn't a need to use echo to provide context to command output. This technique actually ends up resulting in redundant output. To preserve the original context, but eliminate the redundancy, such echo statements have been converted into comment lines.
2012-11-04 03:14:17 +04:00
this should also fail
tests: unify test-push
2012-09-10 08:27:45 +04:00
$ hg push -r master
tests: eliminate use of git-daemon Dulwich now supports local repositories just fine. Not using the daemon makes the tests easier to read and more reliable (less likely to be skipped because a stray daemon is holding onto the port).
2012-09-14 04:49:45 +04:00
pushing to $TESTTMP/gitrepo
push: change "no changes" default output to match normal mercurial The output for "hg push" when there were no changes didn't quite match between Mercurial with and without Hg-Git, so I changed the behavior to bring it into synch. The existing "creating and sending data" message was changed to be included if --verbose is specified.
2012-10-08 04:11:27 +04:00
searching for changes
git_handler: mark source for rename info as Git or Mercurial See inline comments for why the additional metadata needs to be stored. This literally breaks all the hashes because of the additional metadata. The changing of hashes is unfortunate but necessary to preserve bidirectionality. While this could be broken up into multiple commits, there was no way to do that while preserving bidirectionality. Following the principle that every intermediate commit must result in a correct state, I decided to combine the commits.
2014-12-03 01:17:09 +03:00
abort: pushing refs/heads/master overwrites 953796e1cfd8
tests: unify test-push
2012-09-10 08:27:45 +04:00
[255]
tests: convert echos to comments Now that we're in the unified test format, there isn't a need to use echo to provide context to command output. This technique actually ends up resulting in redundant output. To preserve the original context, but eliminate the redundancy, such echo statements have been converted into comment lines.
2012-11-04 03:14:17 +04:00
... but succeed with -f
tests: unify test-push
2012-09-10 08:27:45 +04:00
$ hg push -fr master
tests: eliminate use of git-daemon Dulwich now supports local repositories just fine. Not using the daemon makes the tests easier to read and more reliable (less likely to be skipped because a stray daemon is holding onto the port).
2012-09-14 04:49:45 +04:00
pushing to $TESTTMP/gitrepo
push: change "no changes" default output to match normal mercurial The output for "hg push" when there were no changes didn't quite match between Mercurial with and without Hg-Git, so I changed the behavior to bring it into synch. The existing "creating and sending data" message was changed to be included if --verbose is specified.
2012-10-08 04:11:27 +04:00
searching for changes
push: add more output about what was added (issue #64) l33t pointed out that currently, Hg-Git doesn't provide any confirmation that a push was successful other than the exit code. Normal Mercurial provides a couple other messages followed by "added X changesets with Y changes to Z files". After this change, Hg-Git will provide much more similar output. It's not identical, as the underlying model is substantially different, but the concept is the same. The main message is "added X commits with Y trees and Z blobs". This change doesn't affect the output of what references/branches were touched. That will be addressed in a subsequent commit. Dulwich doesn't provide an easy hook to get the information needed for this output. Instead of passing generate_pack_contents as the pack generator function to send_pack, I pass a custom function that determines the "missing" objects, stores the counts, and then calls generate_pack_contents (which then will determine the "missing" objects again. The new expected output: searching for changes # unless quiet true <N> commits found # if verbose true list of commits: # if debugflag true and at least one commit found <each hash> # if debugflag true and at least one commit found adding objects # if at least one commit found unless quiet true added <N> commits with <N> trees and <N> blobs # if at least one object unless # quiet true https://bitbucket.org/durin42/hg-git/issue/64/push-confirmation
2013-01-06 10:46:57 +04:00
adding objects
tests: dulwich is now smarter about sending fewer objects, update output
2013-12-13 21:41:41 +04:00
added 1 commits with 1 trees and 1 blobs
push: provide better output about changed references (issue #64) As pointed out by l33t, Hg-Git's output for push doesn't currently do a very good job of telling the user what happened. My previous changes in this area had moved some of the output from status to note, making it only show if --verbose was specified. However, I hadn't realized at the time that the reference information (though overly verbose) was providing a valueable purpose that otherwise wasn't met; telling the user that a remote reference had changed. This changeset makes it so that: * default output will include simple messages like "adding reference refs/heads/feature" and "updating reference refs/heads/master" (omitting any mention of unchanged references) * verbose output will include more detailed messages like "adding reference default::refs/heads/feature => GIT:aba43c" and "updating reference default::refs/heads/master => GIT:aba43c" (omitting any mention of unchanged references) * debug output will include the detailed output like in verbose, but addtionally will include messages like "unchanged reference default::refs/heads/other => GIT:aba43c" https://bitbucket.org/durin42/hg-git/issue/64/push-confirmation
2013-01-06 11:31:37 +04:00
updating reference refs/heads/master
tests: unify test-push
2012-09-10 08:27:45 +04:00
tests: convert echos to comments Now that we're in the unified test format, there isn't a need to use echo to provide context to command output. This technique actually ends up resulting in redundant output. To preserve the original context, but eliminate the redundancy, such echo statements have been converted into comment lines.
2012-11-04 03:14:17 +04:00
this should fail, no changes to push
tests: unify test-push
2012-09-10 08:27:45 +04:00
The exit code for this was broken in Mercurial (incorrectly returning 0) until
issue3228 was fixed in 2.1
$ hg push -r master && false
tests: eliminate use of git-daemon Dulwich now supports local repositories just fine. Not using the daemon makes the tests easier to read and more reliable (less likely to be skipped because a stray daemon is holding onto the port).
2012-09-14 04:49:45 +04:00
pushing to $TESTTMP/gitrepo
push: change "no changes" default output to match normal mercurial The output for "hg push" when there were no changes didn't quite match between Mercurial with and without Hg-Git, so I changed the behavior to bring it into synch. The existing "creating and sending data" message was changed to be included if --verbose is specified.
2012-10-08 04:11:27 +04:00
searching for changes
tests: unify test-push
2012-09-10 08:27:45 +04:00
no changes found
[1]
hg2git: in _init_dirs, store keys without leading '/' (issue103) Previously, whenever a tree that wasn't the root ('') was stored, we'd prepend a '/' to it. Then, when we'd try retrieving the entry, we'd do so without the leading '/'. This caused data loss because existing tree entries were dropped on the floor. Fix that by only adding '/' if we're adding to a non-empty initial path. This wasn't detected in tests because most of them deal only with files in the root and not ones in subdirectories.
2014-03-25 22:11:04 +04:00
hg-git issue103 -- directories can lose information at hg-git export time
tests: fix further breakage due to upstream output changes Mercurial changesets 355cfc5dc0f1 and 02e6c82cb015 added messages when bookmarks are activated and deactivated, respectively.
2014-05-27 05:37:09 +04:00
$ hg up master | egrep -v '^\(activating bookmark master\)$'
hg2git: in _init_dirs, store keys without leading '/' (issue103) Previously, whenever a tree that wasn't the root ('') was stored, we'd prepend a '/' to it. Then, when we'd try retrieving the entry, we'd do so without the leading '/'. This caused data loss because existing tree entries were dropped on the floor. Fix that by only adding '/' if we're adding to a non-empty initial path. This wasn't detected in tests because most of them deal only with files in the root and not ones in subdirectories.
2014-03-25 22:11:04 +04:00
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ mkdir dir1
$ echo alpha > dir1/alpha
$ hg add dir1/alpha
$ fn_hg_commit -m 'add dir1/alpha'
$ hg push -r master
pushing to $TESTTMP/gitrepo
searching for changes
adding objects
added 1 commits with 2 trees and 0 blobs
updating reference refs/heads/master
$ echo beta > dir1/beta
$ hg add dir1/beta
$ fn_hg_commit -m 'add dir1/beta'
$ hg push -r master
pushing to $TESTTMP/gitrepo
searching for changes
adding objects
added 1 commits with 2 trees and 0 blobs
updating reference refs/heads/master
$ hg log -r master
git_handler: mark source for rename info as Git or Mercurial See inline comments for why the additional metadata needs to be stored. This literally breaks all the hashes because of the additional metadata. The changing of hashes is unfortunate but necessary to preserve bidirectionality. While this could be broken up into multiple commits, there was no way to do that while preserving bidirectionality. Following the principle that every intermediate commit must result in a correct state, I decided to combine the commits.
2014-12-03 01:17:09 +03:00
changeset: 5:ba0476ff1899
hg2git: in _init_dirs, store keys without leading '/' (issue103) Previously, whenever a tree that wasn't the root ('') was stored, we'd prepend a '/' to it. Then, when we'd try retrieving the entry, we'd do so without the leading '/'. This caused data loss because existing tree entries were dropped on the floor. Fix that by only adding '/' if we're adding to a non-empty initial path. This wasn't detected in tests because most of them deal only with files in the root and not ones in subdirectories.
2014-03-25 22:11:04 +04:00
bookmark: master
tag: default/master
tag: tip
user: test
date: Mon Jan 01 00:00:15 2007 +0000
summary: add dir1/beta
tests: unify test-push
2012-09-10 08:27:45 +04:00
$ cd ..
push: fix traceback when pushing empty hg repo to empty git repo (issue #58) In the logic that was attempting to handle the case where the local repo doesn't have any bookmarks, the assumption was being made that tip resolved to a non-null revision. In the case of a totally empty local repo, however, that isn't a valid assumption, and resulted in attempting to set the master ref to None, which broke dulwich. The "fix", which avoids the traceback and allows the push to complete (though still do nothing, since in this case there aren't any changes to push), is to not tweak the refs at all if tip is nullid. Leaving the special capabilities ref and not adding a master ref appears to be fine in this case.
2012-10-25 08:40:35 +04:00
hg2git: in _init_dirs, store keys without leading '/' (issue103) Previously, whenever a tree that wasn't the root ('') was stored, we'd prepend a '/' to it. Then, when we'd try retrieving the entry, we'd do so without the leading '/'. This caused data loss because existing tree entries were dropped on the floor. Fix that by only adding '/' if we're adding to a non-empty initial path. This wasn't detected in tests because most of them deal only with files in the root and not ones in subdirectories.
2014-03-25 22:11:04 +04:00
$ hg clone gitrepo hgrepo-test
importing git objects into hg
updating to branch default
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R hgrepo-test log -r master
git_handler: mark source for rename info as Git or Mercurial See inline comments for why the additional metadata needs to be stored. This literally breaks all the hashes because of the additional metadata. The changing of hashes is unfortunate but necessary to preserve bidirectionality. While this could be broken up into multiple commits, there was no way to do that while preserving bidirectionality. Following the principle that every intermediate commit must result in a correct state, I decided to combine the commits.
2014-12-03 01:17:09 +03:00
changeset: 4:ba0476ff1899
hg2git: in _init_dirs, store keys without leading '/' (issue103) Previously, whenever a tree that wasn't the root ('') was stored, we'd prepend a '/' to it. Then, when we'd try retrieving the entry, we'd do so without the leading '/'. This caused data loss because existing tree entries were dropped on the floor. Fix that by only adding '/' if we're adding to a non-empty initial path. This wasn't detected in tests because most of them deal only with files in the root and not ones in subdirectories.
2014-03-25 22:11:04 +04:00
bookmark: master
tag: default/master
tag: tip
user: test
date: Mon Jan 01 00:00:15 2007 +0000
summary: add dir1/beta
push: fix traceback when pushing empty hg repo to empty git repo (issue #58) In the logic that was attempting to handle the case where the local repo doesn't have any bookmarks, the assumption was being made that tip resolved to a non-null revision. In the case of a totally empty local repo, however, that isn't a valid assumption, and resulted in attempting to set the master ref to None, which broke dulwich. The "fix", which avoids the traceback and allows the push to complete (though still do nothing, since in this case there aren't any changes to push), is to not tweak the refs at all if tip is nullid. Leaving the special capabilities ref and not adding a master ref appears to be fine in this case.
2012-10-25 08:40:35 +04:00
Push empty Hg repo to empty Git repo (issue #58)
Since there aren't any changes, exit code 1 is expected in modern Mercurial.
However, since it varies between supported Mercurial versions, we need to
force it to consistency for now. (see issue3228, fixed in Mercurial 2.1)
$ hg init hgrepo2
$ git init -q --bare gitrepo2
$ hg -R hgrepo2 push gitrepo2 && false
pushing to gitrepo2
searching for changes
no changes found
[1]
git_handler: Fix extra bookmark created after pushed to empty remote repo.
2015-02-21 09:49:43 +03:00
The remote repo is empty and the local one doesn't have any bookmarks/tags
$ cd hgrepo2
$ echo init >> test.txt
$ hg addremove
adding test.txt
$ fn_hg_commit -m init
$ hg update null
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg push ../gitrepo2
pushing to ../gitrepo2
searching for changes
adding objects
added 1 commits with 1 trees and 1 blobs
test: update test output with summary phase info Upstream Mercurial has added phase info to the summary output. Let's update the test to reflect that.
2015-05-28 22:44:00 +03:00
(the phases line was added in Mercurial 3.5)
$ hg summary | grep -Ev '^phases:'
git_handler: Fix extra bookmark created after pushed to empty remote repo.
2015-02-21 09:49:43 +03:00
parent: -1:000000000000 (no revision checked out)
branch: default
commit: (clean)
update: 1 new changesets (update)
Only one bookmark 'master' should be created
$ hg bookmarks
* master 0:8aded40be5af
Reference in New Issue Copy Permalink