Brendan Cully
c0a2a485b0
Update test-record for 7012707aa4c6
2007-09-06 18:12:36 -07:00
Bryan O'Sullivan
f3ff6b7741
record: change wording of initial per-file prompt
2007-09-06 10:52:54 -07:00
Steve Borho
5a6d8a2860
hgk: add repo root to window title
2007-09-05 21:53:59 +02:00
Thomas Arendsen Hein
2455f3e93d
Forgot to quote "6^" in test-parentrevspec (see 1beb065d7447)
2007-09-04 18:37:28 +02:00
Patrick Mezard
a375f7f845
test-convert-hg-source: enforce conversion order with --date
2007-09-04 13:56:15 +02:00
Alexis S. L. Carvalho
2442d0db1e
convert: rename a class and a function
2007-09-01 02:49:18 -03:00
Alexis S. L. Carvalho
7dac6f1262
convert: mercurial_source: also search for copies in modified files
...
There are some corner cases where we may have a copy in a file that
isn't in the added list:
- the result of a hg copy --after --force
- after a merge across a (local) rename
2007-09-01 02:49:18 -03:00
Alexis S. L. Carvalho
6309fee56a
convert: clear the dirstate before a conversion, invalidate it afterwards
...
Clearing it before the conversion protects us from whatever data were
there (file copies in particular).
Invalidating it after the conversion avoids writing a possibly
inconsistent dirstate to disk.
2007-09-01 02:49:18 -03:00
Alexis S. L. Carvalho
41b6be949d
convert: avoid dirstate checks; add a test
...
During a conversion, the dirstate contents are not consistent - there
are files that may be missing from the dirstate and there may be files
that shouldn't be in the dirstate.
While this is not fixed, don't mark files as added - put them directly
in state 'n'ormal.
2007-09-01 02:49:18 -03:00
Benoit Boissinot
e0d07dc91a
merge with crew
2007-08-31 23:15:44 +02:00
Benoit Boissinot
5025962412
merge with crew-stable
2007-08-31 22:31:43 +02:00
Benoit Boissinot
5e4804df51
fix the dummy 00changelog.i not being copied on clone
2007-08-31 22:31:03 +02:00
Thomas Arendsen Hein
a476e1623a
convert/subversion: Use util.set() instead of set() for python2.3 compatibility
2007-08-31 13:14:03 +02:00
Thomas Arendsen Hein
bf2d3bd959
Fix \ inside ` problem in test-convert-svn (avoids code duplication, too)
2007-08-31 12:54:07 +02:00
Thomas Arendsen Hein
f79502e9bd
merge with crew-stable
2007-08-31 12:40:23 +02:00
Thomas Arendsen Hein
58eb01c17d
Make test-convert-git compatible with other git versions (tested with 1.4.4.3)
2007-08-31 12:32:18 +02:00
Thomas Arendsen Hein
23916758e6
hgweb: Show date of last change for each file in manifest
2007-08-31 11:18:29 +02:00
Benoit Boissinot
284f2adff1
remove unneeded statement
2007-08-31 01:21:31 +02:00
Benoit Boissinot
ecc5117277
kill lonely docstring
2007-08-30 23:54:01 +02:00
Robert Bachmann
39aeb8022a
Atom support: replaced xhtml namespace prefix with default namespace
2007-08-30 18:55:56 +02:00
Robert Bachmann
ecb337b8cb
Added support for the Atom syndication format
2007-08-30 16:42:17 +02:00
Brendan Cully
2a5ee3fd3f
Include . in PYTHONPATH (makes testing unbundled extensions easier)
2007-08-29 17:01:10 -07:00
Brendan Cully
f81247179c
Make run-tests.py work when invoked outside of tests.
...
This makes it usable for unbundled extensions.
2007-08-29 16:50:21 -07:00
Brendan Cully
ff7b7ccc24
Merge with crew-stable
2007-08-29 16:19:27 -07:00
Brendan Cully
ebae83c8bb
When reverting a file which was renamed, also revert the old name
2007-08-29 16:15:23 -07:00
Alexis S. L. Carvalho
de9e404b5c
Avoid a working dir walk while trying to detect copies for diff --git
2007-08-28 23:02:41 -03:00
Alexis S. L. Carvalho
a718b1f9b5
Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB
2007-08-28 22:48:25 -03:00
Brendan Cully
b485f45f0f
bundle: fix up lazy reads
2007-08-27 17:08:53 -07:00
Brendan Cully
1d15f900b3
Make bundlerepo lazier
...
This allows the localbranch extension to override sopener in time.
2007-08-27 15:48:21 -07:00
Brendan Cully
2ddab8e83a
Merge with crew
2007-08-27 15:41:31 -07:00
Brendan Cully
4d5be2d7bc
convert: new config variable hg.tagsbranch controls which branch tags are committed to
2007-08-27 15:39:07 -07:00
Bryan O'Sullivan
6fbb9f2f2f
Push capability checking into protocol-level code.
2007-08-27 14:48:08 -07:00
Bryan O'Sullivan
eba82ab39c
Turn capabilities into a mutable set, instead of a fixed tuple.
2007-08-27 14:16:04 -07:00
Bryan O'Sullivan
babc007db8
Automated merge with http://hg.intevation.org/mercurial/crew
2007-08-27 13:38:34 -07:00
Bryan O'Sullivan
c1bc2ff489
convert: document filemap.
2007-08-27 13:38:16 -07:00
Patrick Mezard
8cbb2aa808
hghave: wrap command output matching
2007-08-27 22:17:51 +02:00
Patrick Mezard
52e5b2ea8e
Test svn repository conversion
2007-08-27 22:17:51 +02:00
Patrick Mezard
2606bb2d09
hghave: detect subversion bindings availability
2007-08-27 22:17:51 +02:00
Patrick Mezard
cf49c2ef36
hghave: detect subversion client and admin tools availability
2007-08-27 22:17:51 +02:00
Patrick Mezard
9e5343f064
hghave: wrap command output matching
2007-08-27 22:17:51 +02:00
Patrick Mezard
6acdd7ff15
run-tests: append PYTHONPATH instead of overwriting it
...
Optional dependencies like svn bindings not necessarily live in site-packages.
2007-08-27 22:17:51 +02:00
Brendan Cully
d9a2ba66f8
convert: svn: check for branch movement in any log entry, not just the first.
...
This fixes, for example,
r4151
D /branches
A /project/branches (from /branches:4150)
A /project/tags (from /tags:4150)
A /project/trunk (from /trunk:4150)
D /tags
D /trunk
2007-08-27 11:56:53 -07:00
Alexis S. L. Carvalho
369cb57512
Merge with crew-stable.
2007-08-27 14:55:33 -03:00
Alexis S. L. Carvalho
4bb4d97472
correctly record file-level history when the local side renames a directory
2007-08-27 14:21:04 -03:00
Alexis S. L. Carvalho
7eed9874b5
Fix theoretical issue in filecommit.
...
If the file was copied, we don't want to reuse the original entry.
I think this is mostly a theoretical issue - when there are copies,
fp1 == nullid, so it's very unlikely that the fl.cmp(fp1, t) would
think the file was unmodified. In any case, if there was a copy,
we should forcefully create a new entry.
2007-08-27 14:21:04 -03:00
Alexis S. L. Carvalho
a409e26406
Avoid adding to the changelog executable files added by the second parent.
...
This was a regression introduced by 349443e942a7.
2007-08-27 14:21:04 -03:00
Alexis S. L. Carvalho
714fa94597
Merge with crew-stable
2007-08-27 02:21:58 -03:00
Alexis S. L. Carvalho
420ceda070
avoid double slash problem mentioned in issue695
2007-08-27 01:44:35 -03:00
Alexis S. L. Carvalho
b7234419e2
clone: remove "file://" before making the path absolute
...
This avoids writing bogus paths to .hgrc. Fixes issue695.
2007-08-27 01:44:35 -03:00
Alexis S. L. Carvalho
73454f8d16
pull -u: if "url#rev" was given, update to rev
2007-08-27 01:44:35 -03:00
