Commit Graph

9583 Commits

Author SHA1 Message Date
Gilles Moris
15a6625324 archive: add branch and tag informations to the .hg_archival.txt file
Up to this changeset, only the repo (first node) and current node hash were
included. This adds also the named branch and tags.

So the additional lines to .hg_archival.txt are
branch: the named branch
tag: the global tags of this revision, one per line in case of multiple tags
latesttag: if the revision is untagged, the latest tag (most recent in
           ancestors), again one per line if this ancestor has multiple tags.
latestagdistance: the longest distance (changesets) to this latest ancestor.
2009-08-11 09:04:02 +02:00
Alexander Solovyov
e3586100e3 fix patchbomb prompt when sending series of patches 2009-10-19 23:27:20 +03:00
Adrian Buehlmann
a482b04850 hg.clone: report branch name on update 2009-10-16 23:57:34 +02:00
Alexander Solovyov
32999e4659 make path expanding more consistent
This expands ~user and $FOO constructs in ui.ignore files, [defaults],
[paths], extension paths, and HGRCPATH files.
2009-10-19 22:19:28 +03:00
Henrik Stuart
0175cbe7e2 tests: fix inadvertent use of existing test repository 2009-10-17 15:40:34 +02:00
David Soria Parra
38f791302b commands: clarify output for the commit summary
It is not clear what is meant with '2 modified, 3 unknown'. We clarify
this by writing '2 modified files, 3 unknown files' instead.
2009-10-19 07:14:44 +02:00
Martin Geisler
a806763de0 commands: do not split a translated string
Splitting the string after translation relies on the implicit
assumption that translators will always translate the English words
using single foreign words.

Also, when translating we want as much context as possible so I've
moved the string formatting into the translatable string.
2009-10-19 14:37:37 +02:00
Matt Mackall
993bb8325e Introduce summary command 2009-10-18 22:31:05 -05:00
Mads Kiilerich
0f7110ec11 Merge with redone 9660769e6539 (issue1860) 2009-10-16 11:19:39 +02:00
Mads Kiilerich
31862f90bd Dummy-merge with 9660769e6539 (issue1860) 2009-10-16 11:18:38 +02:00
Mads Kiilerich
1c7c19b2e6 Redo 9660769e6539 (issue1860) 2009-10-16 11:16:42 +02:00
Martin Geisler
48349e3ff0 Merge with crew-stable 2009-10-16 00:45:18 +02:00
Benoit Allard
f444222eca mq: fix traceback for qpush inexistant-patch with no patch applied 2009-10-16 00:09:18 +02:00
Patrick Mezard
990e7895a0 Merge with crew-stable 2009-10-16 00:06:23 +02:00
Patrick Mezard
f235a47953 convert/svn: better error when hg cannot call itself (issue1838) 2009-10-15 23:15:30 +02:00
Patrick Mezard
7b9a712086 patch: handle symlink updates/replacements (issue1785) 2009-10-15 23:15:30 +02:00
Patrick Mezard
5c89cb752a patch: handle symlinks without symlinkhunk
Symlink creations and deletions were handled with a special symlinkhunk object,
working like a binary hunk. However, this model does not support symlink
updates or replacements, so we teach regular hunks how to handle symlinks.
2009-10-15 23:15:30 +02:00
timeless@mozdev.org
1ee61bd64c rebase: change rebase help to talk about changesets and branch names 2009-10-14 20:55:39 +03:00
Stephen Rasku
15c682540c mq: changed help for qpop -f to reflect actual behaviour 2009-10-14 21:21:09 -07:00
Bryan O'Sullivan
6b7ed127b1 Merge with mpm 2009-10-13 13:43:55 -07:00
Lee Cantey
a3b4b908e5 README: revert accidental commit 2009-10-13 12:27:50 -07:00
Lee Cantey
0c7be02dba test-gendoc: adjust output to account for Swedish translation 2009-10-13 12:23:23 -07:00
Matt Mackall
207b3fe6fe bisect: use util.system and fix good/bad when using -c
The existing scheme using util.find_exe and subprocess.call meant we
couldn't use simple shell commands in tests. Fix that.

Also, it mistakenly used status from the system() call rather than
good from the bisect call in reporting results.
2009-10-12 18:25:46 -05:00
Matt Mackall
34aac1e48a bisect: limit considered set to descendants of first good rev 2009-10-12 14:59:28 -05:00
Matt Mackall
7d81f1588d tests: add -k to test scripts matching keywords
argument is a space-separated list of keywords that are searched for
in the name and body of each test. This makes it easy to run only
tests related to tags, hgweb, revert, etc. (eg -k "tag hgweb revert").
2009-10-12 14:52:53 -05:00
Dirkjan Ochtman
1e4e9a4964 merge with mpm 2009-10-11 21:32:55 +02:00
Matt Mackall
ba7d982f34 run-tests: add --noskips option 2009-10-11 13:58:53 -05:00
Dirkjan Ochtman
0ed5e1df44 merge with crew-stable 2009-10-10 12:24:09 +02:00
Dirkjan Ochtman
3e789a3783 merge with mpm 2009-10-10 12:23:42 +02:00
Dirkjan Ochtman
2b60214db7 merge with hg-stable 2009-10-10 12:19:58 +02:00
Dirkjan Ochtman
02b4677d86 encoding: fix issue with non-standard UTF-8 CTYPE on OS X 2009-10-10 12:00:43 +02:00
Raoul Bhatia [IPAX]
20e457f4b0 use short identifiers in atom feed 2009-10-09 16:27:05 +02:00
Brodie Rao
9507f2f171 color: add test for record support 2009-10-09 03:53:24 -04:00
Patrick Mezard
0936c151e9 Merge with crew-stable 2009-10-09 00:29:39 +02:00
Patrick Mezard
a7d029beb4 patch: do not swallow header-like patch first line (issue1859)
Current solution is hackish but looks like a good trade-off short of rewriting
patch.extract() significantly.
2009-10-08 23:42:33 +02:00
Patrick Mezard
6815e3dc8d windows: fix unlink() not dropping empty tree (issue1861) 2009-10-08 23:32:36 +02:00
Sune Foldager
ded10074e6 rebase: return early when source is descendant of destination
This only happens when using --base (or no source selection options), as
rebase already aborts in this situation when using --source.

Without this change you get an abort from the underlying merge, and the
repository is in a different state than you started with (the working
dir parent is changed).
2009-10-08 10:39:43 +02:00
Sune Foldager
4ecbc53304 rebase: improve error and debug messages 2009-10-08 10:07:41 +02:00
Matt Mackall
b6547e5312 Merge with stable 2009-10-11 13:54:19 -05:00
Matt Mackall
74a4c9da8a merge with stable 2009-10-08 01:17:48 -05:00
Matt Mackall
fa84966ff4 merge with i18n-stable 2009-10-08 01:17:24 -05:00
Matt Mackall
a1d206ff75 Merge with i18n 2009-10-08 01:16:32 -05:00
Matt Mackall
20668220a1 Merge with -stable 2009-10-08 00:59:46 -05:00
Matt Mackall
879810b360 Merge with -crew-stable 2009-10-07 23:45:30 -05:00
Matt Mackall
daf9754427 Merge with -crew-stable 2009-10-07 23:25:41 -05:00
Patrick Mezard
9c21a28056 Merge with crew-stable 2009-10-07 22:50:20 +02:00
Kevin Bullock
a530135c8c color: allow multiple args to ui.write() 2009-10-07 14:01:20 -05:00
TK Soh
3b5f06859c color: add support for record extension 2009-10-08 09:27:22 +08:00
Adrian Buehlmann
db3cee7306 util: move rename into posix.py and windows.py 2009-10-07 20:32:07 +02:00
Adrian Buehlmann
d2944ad3db util: state docstring of rename more precisely 2009-10-07 20:16:43 +02:00