Commit Graph

486 Commits

Author SHA1 Message Date
David M. Carr
62185c7a94 tests: unify test-empty-working-tree 2012-09-10 00:26:43 -04:00
David M. Carr
8ba7aae895 tests: unify test-convergedmerge 2012-09-10 00:26:41 -04:00
David M. Carr
2010c1fc34 tests: unify test-conflict-2 2012-09-10 00:26:39 -04:00
David M. Carr
43dcf302b7 tests: unify test-conflict-1 2012-09-10 00:26:37 -04:00
David M. Carr
8abb31d212 tests: unify test-help 2012-09-10 00:26:33 -04:00
David M. Carr
86f7189548 tests: unify test-keywords 2012-09-10 00:25:59 -04:00
David M. Carr
25923e2745 tests: upgrade run-tests.py
This is the version from Hg 2.3.
2012-09-10 00:24:47 -04:00
David M. Carr
a9cc3d952b readme: update supported versions in README.md 2012-09-10 00:23:35 -04:00
Augie Fackler
fbc67fee2e Merge master into next. 2012-09-09 16:13:02 -05:00
David M. Carr
1b832796d9 push: state when no changes are found 2012-09-05 23:27:31 -04:00
David M. Carr
050798d918 push: only output updated refs 2012-09-05 23:27:31 -04:00
David M. Carr
fb9384235f push: return 1 if no changes found, 0 if success
While working on some other tests, I noticed that the push command was returning
exit code 1 on success.  This changeset makes hgrepo.push use the same return
code contract as localrepo.push, which makes the exit codes behave as expected.
2012-09-05 23:27:31 -04:00
David M. Carr
80baba70c3 makefile: add update support from hg 2.3 to hg 2.3.1 2012-09-05 23:27:31 -04:00
David M. Carr
6edc2d9506 makefile: remove support for hg 1.6.4
This version is too old to support unified tests with all-version-tests.
2012-09-05 23:27:31 -04:00
David M. Carr
6d5f028bb1 tests: fix exec mode on test-help and test-keywords
These tests were being skipped with "not executable" messages
2012-09-05 23:27:31 -04:00
Augie Fackler
41c1d684a6 submodules: only use the ordereddict backport if collections.OrderedDict is unavailable 2012-08-28 09:09:01 -05:00
Augie Fackler
b67b731687 git_handler: remove tab character that snuck in 2012-08-28 09:08:22 -05:00
Augie Fackler
8cff101399 setup.py: bump version to 0.4.0 on the branch containing submodule support 2012-08-28 09:07:41 -05:00
David M. Carr
20a3702adc revsets: add fromgit and gitnode selectors
Support for Hg 1.5.4 was removed, as it doesn't support revsets and is older
than the earliest version we want to put special effort into supporting.
2012-08-22 23:39:45 -04:00
David M. Carr
11cde56154 templatekw: add support for gitnode template keyword 2012-08-22 23:39:45 -04:00
David M. Carr
9e4da6cfb3 help: add additional help topics 2012-08-22 23:39:45 -04:00
David M. Carr
209fd5c717 makefile: document all-version-tests intentions 2012-08-22 23:39:45 -04:00
Mads Kiilerich
0c4f25ccd3 git_handler: fix safehasattr - hg util is hgutil 2012-08-13 18:56:27 +02:00
Artem Tikhomirov
d87f82457b Subrepos: generate .hgsubstate and .hgsub based on gitlinks and .gitmodules, preserve gitlinks on hg commit export. Tests included. Dependency from PyPI's ordereddict to use OrderedDict 2012-08-06 18:30:33 +02:00
Augie Fackler
857bdca65d Bump version number. 2012-08-05 21:10:58 -05:00
David M. Carr
99fed801c4 tests: update versions included in make all-version-tests
This changeset doesn't remove any previous major releases.  Instead, I just
updated major releases to their latest minor release, and added major releases
that have been released since this was last updated.
2012-08-04 15:03:05 -04:00
David M. Carr
3c9f459864 tests: fix for hg 1.5.4
On Hg 1.5.4, util.version() appears to return "unknown", which wasn't an
expected value in the version parsing logic in test-incoming and test-outgoing.
The net result of the change is that test-incoming no longer fails in 1.5.4,
but is skipped instead.
2012-08-04 14:43:48 -04:00
David M. Carr
144abbfefe tests: remove hg 1.4.3 from make all-version-tests
As demonstrated by the test suite, it was already broken.  Specifically, the
"Remove any dangling tag references." section of git_handler.py wasn't properly
detecting Hg 1.4, and fell through to a call to util.safehasattr, which didn't
yet exist.
2012-08-04 14:06:19 -04:00
David M. Carr
66df8cc78c tests: fix test-merge and test-octopus
Both were failing due to extra spaces in the output from merges, which seems
to have been caused by a sed expression not working as intended.  According
to my copy of "man re_format", basic regular expressions (such as used by sed
without the -E option) don't support using + as a special character.  Thus, I
replaced it with one of the recommended alternatives (x+ to xx*).
2012-08-03 01:24:03 -04:00
Augie Fackler
58e29c9254 tests: cope with change in git merge output format 2012-07-31 17:08:37 -05:00
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
15e2601c3a overlaymanifest: add the withflags method introduced in hg change 3f7abfd06d2d 2012-07-26 18:59:19 -05:00
Augie Fackler
e49137e34a girepo: add _capabilities method expected after the peer refactor 2012-07-26 18:58:18 -05:00
Toshi MARUYAMA
2833d729d3 hgrepo: fix _findtags changes on Mercurial 2.2 2012-07-08 16:10:23 +09:00
Artem Tikhomirov
274ecce47c repository in mercurial.repo.py starts with lowercase 2012-07-26 19:01:17 +02:00
Augie Fackler
13504b1f1e gitrepo: correct capitalization of peerrepository 2012-07-19 19:36:57 -05:00
Bryan O'Sullivan
d0a3db710b gitrepo: cope with module/class renames in hg 2.3 2012-07-18 13:16:43 -07:00
Kevin Bullock
5ea6165dba git_handler: fix import_git_objects for Mercurial 2.0+ (issue 36)
This resolves a traceback on pull where hg-git is looking for the
nonexistent repo._tagtypes.
2012-07-04 09:39:23 -05:00
Brian Warner
4f0930a5b3 README: add URLs of homepage, primary hg repo, and git mirror repo
---
 README.md |    4 ++++
 1 file changed, 4 insertions(+)
2012-07-05 17:40:18 -05:00
Augie Fackler
27851f0e49 gitrepo: add url() attribute to fix subrepo support 2012-05-12 03:33:19 -05:00
Augie Fackler
768d569dec tests: cope with yet another git output format change 2012-04-21 12:37:08 -05:00
Augie Fackler
62d195c6c8 git_handler: add missing not from hg metadata extraction 2012-04-21 12:21:29 -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
0df3538436 Merge 2012-03-31 13:59:57 -05:00
Sean Farley
b8476fff7c git_handler: fix line.split error when bad data from a rebase is in the log 2012-03-31 13:55:06 -05:00
Augie Fackler
ebdcf136f1 tests: update for newer git output format 2012-03-31 13:35:49 -05:00
Mike Bayer
f764a03014 - add "author file" extension, allows an author translation map
to put more legit author names in the outgoing git repo
2012-02-23 13:49:07 -05:00
Mike Bayer
6ca9e6dcd1 Add documentation for branch_bookmark_suffix configuration parameter 2012-02-25 16:13:02 -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