Neal Becker
23032b2d99
mergetools.hgrc patch
2008-04-16 15:26:37 -07:00
Dirkjan Ochtman
7863711fa6
mq: don't commit local changes on pushing empty patch (issue1087)
2008-04-16 16:04:07 +02:00
Dirkjan Ochtman
06d8e99e57
remove trailing spaces
2008-04-16 12:09:16 +02:00
Dirkjan Ochtman
f6315d4d81
mq: add a little documentation on qpush -f
2008-04-16 09:35:43 +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
b54ae05232
convert: cleanup svn file copy handling
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
19cd4308ab
convert: more cleanup in svn directory copy handling
2008-04-14 22:31:33 +02:00
Patrick Mezard
c06ff5b448
convert: svn directory copy handling cleanup
2008-04-14 22:31:33 +02:00
Patrick Mezard
a5bba7499c
convert: improve subversion branch filtering
2008-04-14 22:31:33 +02:00
Patrick Mezard
a210321674
convert: rename get_entry_from_path() into an svn_source method
2008-04-14 22:31:33 +02:00
Patrick Mezard
8278052793
convert: fix subpaths detection in svn source
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
e6d132922b
cmdutil: handle and warn about missing copy revisions
2008-04-14 22:31:33 +02:00
Patrick Mezard
53bdaf2c6b
localrepo: forbid nullid copyrev
2008-04-14 22:31:33 +02:00
Patrick Mezard
e6b5e91a5d
verify: check copy source revlog and nodeid
2008-04-14 22:31:33 +02:00
Dov Feldstern
b457436bd5
use internal merge tool when specified for a merge-pattern in hgrc
...
It is possible to specify in the hgrc file that one of the internal merge
tools (internal:fail, internal:local or internal:other) be used for
performing merges on files matching a given pattern. However, this setting
is not being acted upon (the merge tool is not found). This patch fixes that.
2008-04-04 02:21:53 +03:00
Dov Feldstern
2451adfa26
test that internal merge tools are used when set for a merge-pattern in hgrc
...
It is possible to specify that one of the internal merge tools (internal:fail,
internal:local or internal:other) should be used for performing merges on files
matching a given pattern. This test makes sure that such a setting actually
works.
2008-04-04 02:20:58 +03:00
Benoit Boissinot
e297c198c0
fix import with -p0
2008-04-12 22:41:07 -04:00
Patrick Mezard
3409e6fdc3
context: handle untracked files in filectx.fileflags()
2008-04-12 21:08:03 +02:00
Benoit Allard
81977fe9ba
highlight: backward compatibility with pygments 0.5.1
2008-04-10 14:24:27 +02:00
Thomas Arendsen Hein
657d20646f
Fix spacing error introduced in d44685e2377e
2008-04-08 18:39:02 +02:00
Patrick Mezard
7d3027f767
convert: check svn branches are directories
2008-04-07 11:59:20 +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
Christian Ebert
3247bd3127
gendoc: fix indentation
2008-04-06 13:13:31 +02:00
Christian Ebert
e208fbcb2d
hg.1: bogus escaping of .hg* not needed anymore
...
Revert a1f27fda31ea, bbc0eeefe0b3 workarounds.
2008-04-06 13:13:31 +02:00
Christian Ebert
d68174388b
doc: escape .hg at bol in manpages with make (issue1072)
...
This works around a bug in old docbook stylesheets.
Remove .*.swp example from hgignore.5.txt.
Diagnosis and workaround thanks to Alexis S. L. Carvalho.
2008-04-07 09:02:04 +02:00
Patrick Mezard
f572ee0b5f
dirstate: do not ignore current directory '.' (issue 1078)
2008-04-05 18:15:04 +02:00
Patrick Mezard
8fd2c54773
Merge backout
2008-04-04 23:13:32 +02:00
Patrick Mezard
db062e7060
Backed out changeset 86e4750e16d8
...
util.binary heuristic cannot be trusted when decoding working directory files.
2008-04-04 23:09:54 +02:00
Patrick Mezard
8e0cbccd26
Let --unified default to diff.unified (issue 1076)
2008-04-04 22:15:14 +02:00
Dirkjan Ochtman
95639b6467
hgweb: make hgwebdir work in the absence of PATH_INFO
...
Thanks to Andrea Arcangeli for reporting and an initial patch.
2008-04-03 13:14:43 +02:00
Gilles Moris
5b548b29f2
Pager extension: switch it off if --debugger is set
...
The pager is preventing the debugger prompt and much of the
debugger output to be refreshed. Moreover the pager does not
make sense when debugging line by line.
(This supersedes the similar ui.debugflag patch. Disabling
the pager for debug output doesn't make that much sense,
as this is actually when the pager might be useful.)
2008-04-03 11:11:31 +02:00
David Soria Parra ext:(%20php.net%3E)
daf7ac79da
Pager extension: switch it off if --debugger is set
...
The pager is preventing the debugger prompt and much of the
debugger output to be refreshed. Moreover the pager does not
make sense when debugging line by line (Thanks to Gilles Moris).
2008-04-03 10:49:42 +02:00
Thomas Arendsen Hein
a8733ad91a
make test-diff-copy-depth executable
2008-04-02 21:45:35 +02:00
Peter Arrenbrecht
898046c9b1
convert: fix test-convert-svn-* problems with mtime not changing
...
The `svn commit` command does not detect changed files unless
their mtime has changed. A quick succession of, for instance,
`svn co ...; echo x >> y; svn ci` can thus lead to the change to y
being ignored.
Edited by pmezard to write in binary mode.
2008-04-01 09:17:11 +02:00
Thomas Arendsen Hein
448785c6b4
merge with hg-stable
2008-04-01 08:33:17 +02:00
Thomas Arendsen Hein
330a183096
Fix test-convert-svn-tags on case sensitive filesystems
2008-03-30 23:58:02 +02:00
Benoit Boissinot
46509e2ba0
fix error spotted by pychecker
2008-03-30 20:21:46 +02:00
Patrick Mezard
2a688097e7
commands: fix shadowed repo module
2008-03-30 20:18:40 +02:00
Matt Mackall
52b4d9ec25
copies: refactor symmetricdifference as _findlimit
...
We only need to track the lowest revision seen, which makes things simpler.
2008-03-29 12:39:47 -05:00
Matt Mackall
95434837e1
copies: teach symmetric difference about working revisions
...
- use changelog.count() as a pseudo revision number
- abort early in copies if revs are the same
- eliminate working dir hacks in copies
- yield results as they're found
2008-03-29 12:39:47 -05:00
Matt Mackall
56e621f7bc
symmetricdifference: move back to copies
...
It's too tightly dependent on known revlog ordering to fit well in ancestors
2008-03-29 12:39:47 -05:00
Matt Mackall
ab64062215
symmetricdifference: change colors to sides
2008-03-29 12:39:47 -05:00
Matt Mackall
469b176973
ancestors: simplify symmetric difference
...
- n_wanted/wanted -> interesting
- scan colors rather than managing ret
2008-03-29 12:39:47 -05:00
Matt Mackall
ba8f438e7a
copies: don't double-detect items in the directory copy check
2008-03-29 12:39:47 -05:00
Matt Mackall
c9895536f8
copies: skip directory rename checks when not merging
...
The directory rename checks are not meaningful unless we're moving or copying
files across a branch during a merge.
2008-03-29 12:39:47 -05:00
Matt Mackall
1b20d834b6
copies: sort old names by depth
2008-03-29 12:39:47 -05:00
