Matt Mackall
ded6ff0bc4
copies: teach copies about dirstate.copies
...
When we're using copies() to find changes between the working directory and
its first parent for diff/status/etc., use dirstate.copies() directly.
This avoids doing a full statwalk for simple diffs (issue1090) and
removes a special case from the status command.
2008-06-03 15:41:09 -05:00
Dirkjan Ochtman
466179d35f
mq: introduce the qfinish command
2008-06-03 09:34:14 +02:00
Dirkjan Ochtman
2cac185fe4
merge from crew-stable
2008-06-03 12:27:48 +02:00
Dirkjan Ochtman
ff7fe64e1f
mq: don't update the working copy on strip if parents aren't stripped
...
* * *
2008-06-03 12:10:14 +02:00
Patrick Mezard
495db7d2e2
Merge with crew-stable
2008-06-02 21:42:16 +02:00
Patrick Mezard
ea981a320c
test-convert-mtn: test descriptions with quotes
2008-06-02 21:38:52 +02:00
Dirkjan Ochtman
d5bb71e5c9
merge from crew-stable
2008-05-29 22:23:33 +02:00
Stefano Tortarolo
826bd6dc17
Active branches fix (issue1104)
2008-05-29 22:21:29 +02:00
Christian Ebert
1011bbaea8
Make test-bundle-type work on MacOS 10.4.11
...
head on MacOS Tiger doesn't have a -c option.
2008-05-29 16:29:28 +02:00
Patrick Mezard
352a46be1d
localrepo: fix partial merge test (issue 1111)
2008-05-28 22:45:07 +02:00
Patrick Mezard
1c417db0b5
Merge with crew-stable
2008-05-24 18:23:13 +02:00
Patrick Mezard
ada9662975
test-mq-merge: test mq merge and explicit patch queue
2008-05-24 18:11:34 +02:00
Patrick Mezard
49ab85e83f
Merge with crew-stable
2008-05-18 23:49:33 +02:00
Patrick Mezard
ae8e8e5874
test-mq: update qdiff summary output
2008-05-18 20:54:10 +02:00
Patrick Mezard
77b17b8e99
mq: make qselect fail properly on an empty guard
2008-05-18 17:01:24 +02:00
Dirkjan Ochtman
7b9076932b
tests: don't run test-convert-cvs if there's no cvs server
2008-05-23 16:50:17 +02:00
Matt Mackall
fb88571d19
match: remove files arg from repo.status and friends
2008-05-12 11:37:08 -05:00
Matt Mackall
7a52386b9e
walk: return a single value
2008-05-12 11:37:08 -05:00
Matt Mackall
525eaf2be0
walk: remove more old badmatch logic
2008-05-12 11:37:08 -05:00
Matt Mackall
fb724552a5
walk: pass match object to cmdutil.walk
...
- introduce cmdutil.match
- change args to cmdutil.walk
- create match objects for walk calls
2008-05-12 11:37:07 -05:00
Benoit Allard
05751ba685
add compression type type parameter to bundle command
2008-04-24 17:16:02 +02:00
Dirkjan Ochtman
8b56cfd1ea
tests: fix test-highlight output, changed in 7ebbe90114ae
2008-04-24 11:43:54 +02:00
Dirkjan Ochtman
f70807073f
merge from crew-stable
2008-04-16 16:07:15 +02:00
Dirkjan Ochtman
7863711fa6
mq: don't commit local changes on pushing empty patch (issue1087)
2008-04-16 16:04:07 +02:00
Patrick Mezard
6b3f1e7d00
test-merge-internal-tools-pattern: make executable
2008-04-14 23:21:27 +02:00
Patrick Mezard
f7c7c06863
convert: fix svn file copy detection code
2008-04-14 22:31:34 +02:00
Patrick Mezard
9d916aae03
convert: fix svn branch source detection corner case
...
It was confused by composite-looking revisions made by copy + remove.
2008-04-14 22:31:34 +02:00
Patrick Mezard
7914c93a87
convert: handle past or foreign partial svn copies
...
Subversion allows revisions to be composed of subparts coming from revisions
before the parent or from other part of the repository. There is no simple
representation for these now, keep the changes but do not track their origins.
2008-04-14 22:31:34 +02:00
Patrick Mezard
a5bba7499c
convert: improve subversion branch filtering
2008-04-14 22:31:33 +02:00
Patrick Mezard
2b144ed542
test-convert-svn-branches: short identifiers are more legible
2008-04-14 22:31:33 +02:00
Patrick Mezard
08be82588e
Merge with crew-stable, fix test output
2008-04-14 23:28:50 +02:00
Patrick Mezard
acfe08ba86
Merge with crew-stable
2008-04-14 23:04:34 +02:00
Matt Mackall
619e79c725
Merge with -stable
2008-04-13 11:31:45 -05:00
Benoit Boissinot
60caa13781
merge with -stable
2008-04-12 23:05:51 -04:00
Benoit Boissinot
e297c198c0
fix import with -p0
2008-04-12 22:41:07 -04:00
Bryan O'Sullivan
1234e5c53b
test-imerge: disable due to massive brokenness
2008-04-11 22:17:20 -07:00
Matt Mackall
edf5a0f5d0
resolve: new command
...
- add basic resolve command functionality
- point failed update and merge at resolve
2008-04-11 12:52:56 -05:00
Adrian Buehlmann
00f3faf7cc
fixed missing sorting in test-dumprevlog
...
The test failed at random because the order of files was non-deterministic,
which produced diffs in test output.
2008-04-11 09:27:28 +02:00
Patrick Mezard
0ec4a6ad34
test-dumprevlog: fix extra path separator under MacOSX
...
The "find .hg/store/ -name '*.i'" command returned paths with extra separators
like '.hg/store//00changelog.i'.
2008-04-11 11:21:55 +02:00
Matt Mackall
8d82cba09a
merge: introduce mergestate
2008-04-10 15:02:24 -05:00
Dirkjan Ochtman
8e0e741a7c
python-2.6: md5 import in test-archive helper
2008-04-08 15:41:21 +02:00
Patrick Mezard
4f5e5e015a
Merge with crew-stable
2008-04-07 13:16:11 +02:00
Patrick Mezard
7d3027f767
convert: check svn branches are directories
2008-04-07 11:59:20 +02:00
Dirkjan Ochtman
e31d0e46c9
Merge from crew-stable.
2008-04-07 09:26:40 +02:00
Adrian Buehlmann
94cd97b240
tests/test-diff-copy-depth: using sh instead of bash
...
test failed on plain FreeBSD 6.2 due to nonexistent bash
2008-04-07 09:02:26 +02:00
Isaac Jurado
ec51524d45
highlight: Generate pygments style sheet dynamically
...
This patch allows a per-repository (for example, within a hgwebdir) selection
of pygments_style web option. No static .css files required.
Test edited by pmezard (compatibility fixes)
2008-04-05 21:29:02 +02:00
Patrick Mezard
6cb37d1b54
Merge with macencode branch
2008-04-05 19:33:34 +02:00
Patrick Mezard
5f02ff8613
test-mactext: simplify test, coverage is ensured by win32text tests
2008-04-05 19:03:45 +02:00
Patrick Mezard
ad00fc6726
Merge with crew-stable
2008-04-05 18:19:49 +02:00
Patrick Mezard
f572ee0b5f
dirstate: do not ignore current directory '.' (issue 1078)
2008-04-05 18:15:04 +02:00
