Matt Mackall
fbb5127472
use repo[changeid] to get a changectx
2008-06-26 14:35:46 -05:00
Matt Mackall
5867ff1667
use repo.changectx(None) to get a workingctx
2008-06-26 13:46:29 -05:00
Matt Mackall
0a211cf39a
context: consistently return p1 context for None
2008-06-25 17:33:51 -05:00
Matt Mackall
9ab99468a9
lookup: optimize '.'
...
Remove error messages as behavior is documented in hg help revs
2008-06-25 17:33:34 -05:00
Dirkjan Ochtman
a2fa8fc7e2
fix dumb test failure introduced in 31fe61a80219
2008-06-25 10:37:07 +02:00
Dirkjan Ochtman
bf8b01e844
merge: only in-branch merges can be implicit
2008-06-23 15:02:52 +02:00
Patrick Mezard
31cc575735
test-commit: test unset date is not read as epoch origin
2008-06-23 10:36:00 +02:00
Patrick Mezard
93bb017ccb
convert: hg sink commits without working dir
2008-06-19 00:14:24 +02:00
Patrick Mezard
67c45a2700
context: let workingctx.date(), .user() and description() be overriden
2008-06-18 22:52:26 +02:00
Dirkjan Ochtman
bb2114f00f
tests: make new convert-cvs tests executable
2008-06-18 12:38:45 +02:00
Dirkjan Ochtman
a74c0e9f94
tests: fix test breakage from graph template changes
2008-06-18 11:08:21 +02:00
Frank Kingswood
6c0cfe8797
convert: cvs.py - Allow user to use built-in CVS changeset code.
...
tests: add two testcases for CVS conversion with builtin CVS
including a testcase for issue 1148.
2008-06-15 16:05:46 +01:00
Thomas Arendsen Hein
393614fcfa
merge with crew-stable
2008-06-16 11:51:19 +02:00
Thomas Arendsen Hein
6fbdf04649
run-tests.py: Make tests run with python2.3 if HGTEST_* is set.
...
optparse of python2.3 does not transform default values to the specified
type so e.g. "HGTEST_JOBS=4" (introduced in b8e8d6b0ae08) causes tests
to abort, because options.jobs is set to '4' instead of the number 4.
2008-06-16 11:37:26 +02:00
Patrick Mezard
1fa87a95fd
Merge with crew-stable
2008-06-15 13:05:39 +02:00
Patrick Mezard
c7f6f81b90
Ignore dummy copies in dirstate and localrepo.filecommit()
2008-06-15 13:01:03 +02:00
Christian Ebert
dba21309cf
keyword: mimic cmdutil.bail_if_changed even more
...
At the check before overwriting with kwexpand, kwshrink:
- abort when in middle of merge
- give terser abort message
2008-06-12 02:27:06 +02:00
Matt Mackall
9861703d4b
tag: record tag we're superseding, if any (issue 1102)
2008-06-13 17:29:10 -05:00
Jason Orendorff
1b4f863a3f
mq: qdiff: support all diffopts
2008-06-12 07:38:15 -05:00
Christian Ebert
a2f0369b37
keyword: disable expansion for annotate
...
Keyword expansion should not be annotated.
Annotate revision when unexpanded keyword was inserted.
Add test.
2008-06-12 11:01:36 +02:00
Matt Mackall
dccdda4480
Merge with crew
2008-06-10 12:11:06 -05:00
Dirkjan Ochtman
cd5e863912
hgweb: show cset node and description when hovering over annotate prefix
2008-06-07 17:52:00 +02:00
Patrick Mezard
a19a271534
Merge with crew-stable
2008-06-07 11:43:16 +02:00
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
Johannes Stezenbach
fd4475d65a
help: move "revision syntax" help topics into online help
...
Move the "Specifying Single Revisions" and "Specifying Multiple
Revisions" help topics from the manual page into the helptable
so they are available both online and in the manual page.
2008-06-03 21:20:52 +02:00
Johannes Stezenbach
cb9002a114
help: list special help topics with -v
2008-06-03 20:56:54 +02:00
Patrick Mezard
e8f9e548cb
Merge with crew-stable
2008-06-06 18:31:57 +02:00
Patrick Mezard
574f71dd66
test-mq-qrename: test added patch renaming
2008-06-06 18:23:33 +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
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
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
Maxim Dounin
1ce305a01e
addremove: correctly handle intermediate symlinks
...
This fixes problems mentioned in issue660 comments (unrelated to original
issue) where directory was renamed, and symlink was added instead.
In such situation addremove wasn't able to correctly detect that old files
no longer here, but tried to add symlink (and failed due collision with
old files).
2008-05-07 14:32:00 +04: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
