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
Patrick Mezard
1620a3ec34
Merge with crew-stable
2008-12-14 18:13:41 +01:00
Benoit Boissinot
f57ea72890
merge with -stable
2008-12-13 13:28:20 +01:00
Brendan Cully
383f1ab54c
Merge with crew
2008-12-12 12:34:57 -08:00
Patrick Mezard
50f814764a
Merge with crew-stable
2008-12-11 23:36:43 +01:00
Patrick Mezard
1ac6f464a8
patch: catch only IOError from makedirs()
2008-12-11 22:59:35 +01:00
Patrick Mezard
b8790bb493
test-mq-missing: add test for directory creation on git copy
2008-12-11 22:59:35 +01:00
Jim Hague
463ab45a63
Revise Bugzilla module comments into extension help.
...
Revise the comments detailing module usage at the start of the Bugzilla
extension into extension help text.
Expand the detail given on extension settings, in an attempt to permit
the user to configure successfully without having to study the extension
code. Show a sample configuration as well.
2008-12-10 16:29:53 +00:00
Patrick Mezard
0f741b13f8
test-convert-cvs-builtincvsps: test debugcvsps command
2008-12-10 17:47:56 +01:00
Frank Kingswood
3e985ec0a4
Add debugcvsps command, replacing cvsps script
2008-12-10 14:02:54 +00:00
Dirkjan Ochtman
59381ca14c
merge stable changes, via crew-stable
2008-12-10 11:32:31 +01:00
Dirkjan Ochtman
a1003695b5
merge changes from stable
2008-12-10 11:30:11 +01:00
Brendan Cully
8fa18a6932
Merge with crew-stable
2008-12-09 17:02:52 -08:00
Brendan Cully
3cfb5b4e74
issue1419: catch strange readline import error on windows
2008-12-09 17:01:14 -08:00
Patrick Mezard
42823196e7
Merge with crew-stable
2008-12-10 00:29:10 +01:00
Patrick Mezard
1ab0600f40
util: disable walkrepo() recursive behaviour
...
Revert b1aea76f700 and c6d3b233571e for performances reasons. Traversing
checkout working directories may be too expensive.
2008-12-10 00:16:12 +01:00
Stefan Rusek
601a15ee5f
When applying a git diff, ensure that the target dir exists for new files
2008-12-09 14:27:47 +01:00
Jim Hague
791ab1df7d
Fix Bugzilla integration to work with new Bugzilla 3.2.
...
Bugzilla 3.2 changes the type of all MySQL tables it uses from MyISAM
to InnoDB. MyISAM does not support transactions, and performs an implied
commit after each update. InnoDB does support transactions, and so
exposes a bug where changes to the Bugzilla database were not committed,
and so with 3.2 are lost when the database connection closes.
2008-12-09 09:58:13 +00:00
Benoit Allard
a26522bf8d
tests: test-walkrepo shouldn't throw SystemExit
...
Write to stdout instead of throwing Exceptions
2008-12-08 20:42:53 +01:00
Benoit Boissinot
8475dd904f
bookmarks: this is a comment, not a string
2008-12-07 19:59:01 +01:00
