Matt Mackall
d6a350a3b0
setup: warn about missing standard Python components
2008-12-31 17:59:58 -06:00
Matt Mackall
3d1747bbc3
Added signature for changeset 243ea1d92769
2008-12-31 17:38:35 -06:00
Peter Arrenbrecht
e4941ea8f1
test-audit-path: add more tests (issue 1450)
2008-12-30 22:10:41 +01:00
Matt Mackall
71a02e35c5
audit: reject paths with .hg (issue 1450)
...
Spotted by Peter Arrenbrecht
2008-12-31 16:27:20 -06:00
Pascal Quantin
74c4b6e60d
monoblue: add less/more links to graph page
2008-12-31 14:21:00 +01:00
Bernhard Leiner
586b4a2c7c
Circumvent removal of valid bisect candidates due to previously skipped ones
...
As reported in issue 1445:
A valid candidate revision for a bisect test is not considered for testing
due to its skipped ancestor. If this revision is the only untested one left
an assertion error occurs.
2008-12-27 19:05:26 +01:00
Benoit Boissinot
e2908a6b20
merge bookmarks
2008-12-31 15:04:18 +01:00
David Soria Parra
b3a470f0b4
bookmarks: tests for track.current option
2008-12-31 14:29:51 +01:00
Dirkjan Ochtman
30e2dc5876
merge with crew-stable
2008-12-31 14:23:19 +01:00
Gilles Moris
9b7deb4420
test-hgweb-*: replace "XX years ago" by a fixed string in get-with-headers.py
...
Note that other sed replacement commands are also filtering get-with-headers.py,
but they seem to be more test specific, hence not handled here.
2008-12-25 17:49:08 +01:00
Alexander Solovyov
c1774bb6c3
python implementation of diffstat
...
Implemented as two functions: diffstat, which yields lines of text,
formatted as a usual diffstat output, and diffstatdata, which is called
inside diffstat to do real performing and yield file names with
appropriate data (numbers of added and removed lines).
2008-12-25 10:48:24 +02:00
Benoit Boissinot
abff8a39e9
add a comment about the need of hg._update()
2008-12-28 19:59:42 +01:00
Benoit Boissinot
c79382f326
merge with -stable
2008-12-28 20:21:20 +01:00
Bryan O'Sullivan
4b780a188c
Merge crew and stable
2008-12-21 12:19:12 -08:00
Dirkjan Ochtman
2e8136936a
merge with stable
2008-12-21 09:40:55 +01:00
Matt Mackall
026ea0c12c
Merge with stable
2008-12-20 16:27:51 -06:00
Matt Mackall
5c1f44e6af
Added signature for changeset a0a480eb3771
2008-12-20 16:12:01 -06:00
Dirkjan Ochtman
934178e495
merge with stable
2008-12-20 13:09:05 +01:00
Matt Mackall
bb9114d8ba
resolve: clarify and simplify help
2008-12-19 20:58:33 -06:00
Matt Mackall
003766b33a
tests: fix no-diffs option
2008-12-19 16:48:32 -06:00
Matt Mackall
96311238c8
archive: fix bogus error message with no working directory
2008-12-19 16:48:31 -06:00
Matt Mackall
966fa4be08
resolve: require -a switch to resolve all files
...
Like revert -a, this should make this command slightly safer
2008-12-19 16:47:36 -06:00
Gilles Moris
5483cf6270
color: fix colorization of the 'old mode' git diff metadata
2008-12-19 22:32:08 +01:00
Benoit Boissinot
cdbd418b62
merge with -stable
2008-12-20 00:43:03 +01:00
Benoit Allard
1a0335d3f0
fix typo
2008-12-19 21:38:01 +01:00
Dirkjan Ochtman
265b2d6c5c
merge with crew-stable
2008-12-19 18:49:02 +01:00
Dirkjan Ochtman
600f058f30
hgweb: mq repos should be in non-recursive collections, too
2008-12-19 18:24:49 +01:00
Dirkjan Ochtman
46c7d48798
merge with crew-stable (again)
2008-12-19 08:42:41 +01:00
Dirkjan Ochtman
21211bc14d
tests: fix test-mq-qclone-http (broken by 8cf97ec9314a)
2008-12-19 08:41:46 +01:00
Dirkjan Ochtman
8215a72dd6
merge with crew-stable
2008-12-19 08:20:19 +01:00
Benoit Allard
6edf6273f0
hgweb: recurse down collections only if ** in [paths]
...
collections: direct child repos only
paths *: direct child repos only (like collections)
paths **: recursive discovery
When ** is used, the mq repository (if any) is also shown.
2008-12-18 22:32:48 +01:00
David Soria Parra
be4a8348c4
bookmarks: set the current bookmark to the new name if we rename the current bookmark
...
If we rename the current bookmark, we have to set the current bookmark
to the new name.
2008-12-18 10:51:11 +01:00
Christian Ebert
a9689af26d
keyword: simplify repo.local and bundle check (as in dddd37603ecd)
2008-12-16 09:58:41 +01:00
Brendan Cully
9645dba34e
Merge with crew-stable
2008-12-15 12:03:28 -08:00
Brendan Cully
f24e56c3ad
inotify: do not attempt to monkeypatch bundlerepos
2008-12-15 12:02:18 -08:00
Brendan Cully
81d39df2bc
Merge with crew-stable
2008-12-14 23:05:18 -08:00
Brendan Cully
6e6159b63f
patch: handle git patches that remove symlinks (issue1438)
2008-12-14 23:04:29 -08:00
Patrick Mezard
6f86a4092b
context: enforce memctx.files() unicity
...
localrepo.commitctx() expects changed files lists to contain unique items and
does not sort itself. Passing duplicates makes them evaluated more than once
and changes the committed changelog id.
2008-12-14 17:35:19 +01:00
Adrian Buehlmann
b2991e8893
store: encode trailing period and space on directory names (issue1417)
...
Windows won't create directories with names ending in period or space, so
we encode the last period/space character in directory names of non-hashed
paths in the store using reversible ~xx encoding (' ' -> '~20', '.' -> '~2e').
With this change it is possible to remove a directory ending in period or space
that was inadvertantly checked in on a linux system while still being able
to clone such a repository with its full history to Windows (see also issue793).
2008-12-13 18:32:29 +01:00
Adrian Buehlmann
9a0526b2cd
store: don't create dirs ending in period or space for hashed paths (issue1417)
...
Windows won't create directories with names ending in period or space, so
we replace the last period/space character in truncated directory names of
hashed paths with some other character (underbar).
2008-12-13 17:39:56 +01:00
Frank Kingswood
e9b2b07250
convert-cvs: correctly handle Removed replies, fixes bug 1427
2008-12-11 13:33:35 +00:00
David Soria Parra
08eff02ce6
Merge backout
2008-12-07 19:33:26 +01:00
David Soria Parra
14696164ce
Backed out changeset 20eab7f4a1d4
...
In discussion with mpm and tonfa we decided that we need a more generic
solution and not a bookmark specific.
2008-12-07 19:31:38 +01:00
David Soria Parra
c12ea40a5b
Merge backout
2008-12-07 19:28:09 +01:00
David Soria Parra
cddd546d56
Backed out changeset d525e255b161
...
In discussion with mpm and tonfa we decided that we need a better rev
syntax instead of a bookmark specific solution.
2008-12-07 19:27:57 +01:00
David Soria Parra
35728e2c1f
bookmarks: do not overwrite bookmarks.current if not necessary
...
If we update to the ref that the bookmarks.current points to, we do
not want to update bookmarks.current
2008-12-06 19:30:20 +01:00
Alexander Solovyov
39829ac393
bookmarks: add --only-bookmark option to log
2008-12-06 14:03:30 +02:00
David Soria Parra
18c8648fbf
bookmarks: Fix tests
...
As we merge tags now with bookmarks we have add those tags
to the tests.
2008-12-06 16:15:59 +01:00
David Soria Parra
878c5244fa
bookmarks: more git-like branches
...
Bookmarks are not really git branches, but with the track.current option we try
to focus more on a git like behavior as this was requested.
2008-12-06 01:10:11 +01:00
Bartosz SKOWRON
5c9eae5dcc
patch: simplify linereader
2008-12-05 14:51:50 +01:00
