Commit Graph

73 Commits

Author SHA1 Message Date
Augie Fackler
c13e8ed89d tests: import test-push-r (with slight changes) from Mercurial
This lets us detect defects in our wrappers which would break
Mercurial when working against normal hg repositories with hg-git
enabled.
2010-08-15 09:45:00 -05:00
Augie Fackler
c452d54ea2 test-git-submodules: update for git output format change 2010-07-30 16:12:13 -05:00
Augie Fackler
212cef6c15 test-url-parsing: defend against changes in dulwich 2010-07-05 11:47:34 -05:00
Augie Fackler
1e60838d6e test-pull-after-strip: discared new backup message from strip 2010-06-12 21:48:41 -05:00
Augie Fackler
5518aa1a5a Cope with tags being sorted (hg cset 0376c4f17df5) by backporting that behavior 2010-06-12 21:14:33 -05:00
Augie Fackler
07ad6a34c9 Merge test fix. 2010-04-05 18:52:58 -05:00
Tay Ray Chuan
e283322a66 test-pull-after-strip: don't run git-cleanup twice 2010-04-05 13:28:52 +08:00
Tay Ray Chuan
fff9a81fa3 Merge branch 'rc/push-tag' into rc/master 2010-04-04 23:26:46 +08:00
Tay Ray Chuan
58dec6d0a4 when pushing, check if server is advertising annotated tags
Check if already we have these annotated tags; if so, don't push it.

Update test-git-tags too.
2010-04-04 23:16:00 +08:00
Tay Ray Chuan
0fa6f2e0fe test-git-tags: test pushing to repo with annotated tags
Currently, this fails with a 'tag has changed' message.

Additionally, set the receive.denyCurrentBranch config, as we're pushing
a branch to a git repo which has checked out that branch. Also, this is
to handle git after v1.7.0, where that config defaults to "refuse".
2010-04-04 23:10:10 +08:00
Tay Ray Chuan
336ec5a893 update_remote_branches: refactor head usage
Splice the ref name only once, and don't loop through refs/heads
multiple times.

This changes the order in which hg tags are created; update test output
to reflect this.
2010-03-29 13:19:00 +08:00
Tay Ray Chuan
1a2811a633 tests: specify --pretty format
If the user sets git config --global format.pretty, all hell breaks
loose. Specifying it prevents this.
2010-03-28 12:21:48 +08:00
Augie Fackler
d1961293e0 Various hg 1.4 compat fixes. 2010-03-27 21:37:58 -05:00
Augie Fackler
85fe0468ec test-hg-branch: sed hashes from hg < 1.5 2010-03-27 21:16:41 -05:00
Augie Fackler
4e59f313a6 pull: make it possible to un-wedge the repo after stripping git revs
This adds a new command, which is inelegant, but it lets you safely
pick up pulling fairly quickly.
2010-03-25 20:24:00 -05:00
Augie Fackler
5f31688932 tests: many, many changes so we never push into a checked-out ref 2010-03-25 19:54:00 -05:00
Augie Fackler
fdd03567a1 tests: missed some hash changes last time around 2010-03-03 19:25:29 -06:00
Augie Fackler
7e9ef6943c tests: fix for new sorting of extra in hg and new topological sort 2010-03-03 17:47:00 -06:00
Augie Fackler
3e1ab2fc85 test-git-workflow: work around git output format change 2010-03-03 17:43:01 -06:00
Abderrahim Kitouni
2c65097235 fix gimport and add test for using to work on hg repos from git (issue 73) 2010-02-26 19:27:32 +01:00
jeremy avnet
c6ea6998e8 Don't import git submodule files (we don't support them .. yet). 2010-02-23 16:23:09 -05:00
Augie Fackler
fc62064c74 git_handler: use progress API instead of reinventing the wheel 2010-02-24 21:08:38 -06:00
Benoit Boissinot
ec3fad56d9 use a simple toposort algorithm for DAG (post order from a DFS from the heads) 2010-02-24 17:21:23 +01:00
Benoit Boissinot
b1861d6f6d make sure no tag object are included in the DAG we build 2010-02-24 17:21:20 +01:00
Augie Fackler
197936d8b3 tests: update some test expectations 2009-12-26 13:41:56 -06:00
Augie Fackler
48f2a58b23 Merge with abderrahim. 2009-12-26 13:31:24 -06:00
Augie Fackler
504dd7f416 git_handler: update for slight API change in bookmarks
This should continue being backwards compatible through at least hg 1.3, perhaps further.
2009-12-26 12:22:06 -06:00
Abderrahim Kitouni
91561c5a2e fix a bug when a directory is replaced with a file
also use ObjectStore.tree_changes from dulwich instead of our own func
(the change to test octopus is legitimate, there were some duplicate
entries)
2009-12-25 08:56:20 +01:00
Abderrahim Kitouni
6a70b4397d accept both old and new hg output for clone 2009-11-23 19:28:20 +01:00
Abderrahim Kitouni
f2f0e03e94 fix running unit tests with the test runner 2009-11-23 19:10:32 +01:00
Abderrahim Kitouni
c07321597c undo changes from 8b927e612456 (GNU sed doesn't have a -E option) 2009-11-23 18:58:40 +01:00
Augie Fackler
899f88dbc9 tests: update test expectations for hg change 00655544b9f3 2009-10-27 22:40:11 -04:00
Augie Fackler
44d75ddc05 tests: inline unit tests into main test suite 2009-10-27 22:39:45 -04:00
Augie Fackler
5bccae8cb3 tests: Fix tests with new repo layout.
Also make all tests bail early if dulwich is not available.
2009-10-25 10:52:50 -05:00
Augie Fackler
7c180ed8af Merge test fixes. 2009-09-25 22:44:05 -04:00
Abderrahim Kitouni
70cf8e8023 tests: work around output variations in newer git versions 2009-08-19 21:13:07 +01:00
Augie Fackler
04319ec5f3 tests: work around output changes in newer git versions
In particular, newer gits no longer show ... in merged revisions,
use ' instead of " when checking out a branch, and changed the
output format of commit information completely.
2009-08-11 00:13:37 -04:00
Abderrahim Kitouni
e3d224ab39 disable thin packs as they aren't handled correctly 2009-08-01 18:33:58 +01:00
Abderrahim Kitouni
a73b315aba initial support for pull -r 2009-08-01 17:55:54 +01:00
Abderrahim Kitouni
6a2aac5247 initial support for 'hg outgoing' 2009-07-31 18:15:02 +01:00
Abderrahim Kitouni
69b203636c rework pushing to support --rev and --force options 2009-07-30 22:09:53 +01:00
Abderrahim Kitouni
89ffefb443 store non utf-8 encoded author/commit message as deltas 2009-07-24 21:23:35 +01:00
Abderrahim Kitouni
a314af7620 do not pull from git when asked to push 2009-07-23 08:47:23 +01:00
Abderrahim Kitouni
8bb2513712 support local git repositories (fixes issue 5 bb) 2009-07-23 08:38:20 +01:00
Abderrahim Kitouni
16f2ebc151 add a new test for git tags 2009-07-07 17:45:29 +01:00
Abderrahim Kitouni
40481436fe fix pushing tags to git (see issue 3 bb) 2009-07-07 11:46:19 +01:00
Abderrahim Kitouni
d2effa3dff add test for named branches 2009-07-07 10:47:26 +01:00
Abderrahim Kitouni
5459a96f50 merge the fix for the encoding field bug 2009-07-03 16:46:26 +01:00
Abderrahim Kitouni
6a23c5c79f fix the encoding bug correctly 2009-07-03 16:44:25 +01:00
Abderrahim Kitouni
e9fb1ccb75 add a test for pushing to git 2009-07-02 13:27:14 +01:00