Commit Graph

102 Commits

Author SHA1 Message Date
David M. Carr
f89059b98d tests: tweak which hg versions run test-pull-after-strip
Without this change, the test is skipped for modern versions of Mercurial
with minor version less than 5, despite the test actually passing for said
versions.
2012-07-31 22:55:15 -04:00
Augie Fackler
768d569dec tests: cope with yet another git output format change 2012-04-21 12:37:08 -05:00
Augie Fackler
9ada7156ea test-url-parsing.py: add a test for a username that starts with a number
This had broken at some point, and it's currently fixed. Added a test
to keep it from regressing in the future.
2012-04-20 21:16:32 -05:00
Augie Fackler
ecc1e7635e test-url-parsing.py: stop manually enumerating test methods 2012-04-20 21:11:19 -05:00
Augie Fackler
ebdcf136f1 tests: update for newer git output format 2012-03-31 13:35:49 -05:00
Keshav Kini
89e9168ff4 Remove illegal characters from username/email
Includes a doctest and tests in test-hg/author for the correct behavior.
2012-02-15 09:30:06 +08:00
Jason R. Coombs
c927a00fe4 Strip trailing slash for heroku-style URLs. Fixes #31. Includes a regression test for the fix. 2012-01-27 22:48:55 -05:00
Augie Fackler
2d280d3dfb Update for newer dulwich and hg versions. 2012-01-27 11:06:27 -06:00
Tay Ray Chuan
29bac75cc1 tests: accomodate changes in git-merge output
Since git v1.7.7, merge outputs its status in the form

  Merge made by the * strategy.

Use a regex substitution, so that older versions are handled
successfully as well.

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
2011-10-09 13:39:37 -05:00
Ehsan Akhgari
d57f385799 Improve the parsing of author lines from Mercurial to generate committer and author lines that git can correctly understand
Signed-off-by: Ehsan Akhgari <ehsan.akhgari@gmail.com>
---
I found a number of bugs when I was trying to convert Mozila's hg repository
to git using hg-git.  This patch fixes a number of bugs with irregular
author lines present in hg repositories.  Git cannot correctly process a
commit object which has a committer or author line in a format that it does
not understand, which makes it not be able to handle the repositories
with have such commit objects.

The added test cases shows the irregular cases that this patch is able to
deal with.
2011-09-09 16:12:49 -05:00
Augie Fackler
7659e2b8a6 outgoing: abort on broken hg versions rather than printing wrong results 2011-09-09 16:08:31 -05:00
Augie Fackler
5286104b4d test-incoming: test updates for progress capturing 2011-09-09 15:49:31 -05:00
Augie Fackler
9b926199fe Merge test fixes for dulwich changes and output changes. 2011-09-09 15:44:25 -05:00
Augie Fackler
43c3024db6 Fix all-version-tests. 2011-07-19 08:11:02 -05:00
Augie Fackler
0e48fa29cb test-url-parsing: update expecations missed by 70247167a4b5 2011-07-13 08:06:52 -05:00
Junichi OKADOME
41fa77794d to be recognized port number in path to repository 2011-07-13 17:51:16 +09:00
Augie Fackler
fbaa1cbcfb Test output format tweaks for test-outgoing. 2011-06-19 10:34:10 -05:00
Augie Fackler
5344bfdeb2 test-incoming: fixes for hg 1.7 2011-06-17 16:20:08 -05:00
Augie Fackler
890facca02 test fixes for progress cleanup 2011-06-17 15:01:31 -05:00
Augie Fackler
98050ffe8b test-incoming: only run on hg 1.7.x and newer 2011-05-31 19:36:53 -05:00
Brendan Cully
95c74ae913 Support for hg incoming 2011-05-24 11:16:45 -07:00
Augie Fackler
6884457b1f test-conflict-{1,2}: cope with minor hg output variations 2011-05-25 09:25:34 -05:00
Christian Walther
0ce3373b35 New tests for round-trip fidelity of merge conflicts resolved using one parent.
First one currently fails.
2011-05-24 20:07:37 +02:00
Christian Walther
da1c5f2996 New test for round-trip fidelity of a merge of converged files.
Currently fails.
2011-05-24 20:07:37 +02:00
Augie Fackler
838af18b9f test-pull-after-strip: Update expectations since we are not refetching objects 2011-05-18 08:14:02 -05:00
Augie Fackler
bd7b30f743 tests: update expectations after message cleanups 2011-05-18 08:10:00 -05:00
Augie Fackler
479bebaa1f tests: cope with output format changes in hg 1.8
These test changes should make it easier to see what's still broken in
1.8 and 1.9. Ideally, we'll drop pre-1.8 versions soon and rip most of
this out, but I'm not sure how realistic that is in the short term.
2011-05-15 17:04:05 -05:00
Augie Fackler
12ed874aa4 tests: use run-tests.py's built-in daemon killing
Makes interrupting a test run more graceful and overall less
frustrating.
2011-05-15 12:23:53 -05:00
Augie Fackler
1b5193949d test-git-workflow: mark git repo as not bare so we can do commits 2010-11-16 08:34:26 -06:00
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