Commit Graph

8238 Commits

Author SHA1 Message Date
Matt Mackall
f3552e4141 config: allow spaces in key portion of items 2009-04-29 20:47:30 -05:00
Matt Mackall
f4f1e74f08 localrepo: use set for requirements 2009-04-29 20:47:28 -05:00
Matt Mackall
2beed3c7cc dirstate: use propertycache 2009-04-29 20:47:18 -05:00
Matt Mackall
a2f3734c4c localrepo: use propertycache 2009-04-29 20:47:15 -05:00
Steve Borho
52bf113f2e ui: replace regexp pattern with sequence of choices
Use ampersands (&) to delineate the response char in each choice.
ui.prompt() responses are now explicitly case insensitive.  GUIs
that subclass ui can generate dialogs from the full choice names.
2009-04-30 10:15:32 -05:00
Bryan O'Sullivan
092a707d59 run-tests.py: ensure that hgpkg is always visible 2009-04-24 14:40:56 -07:00
Patrick Mezard
695b5f0d5f Fix missing import from 4bea569e9933 merge 2009-04-30 08:38:20 +02:00
Patrick Mezard
0cdb05f6a7 Merge with crew-stable 2009-04-29 23:56:20 +02:00
Martin Geisler
9302c79c56 churn: use .hgchurn in repo root as default map file 2009-04-29 20:03:54 +02:00
Sune Foldager
2f3ee06863 util.rename: use temporary file name for rename-targets on windows
Use a temporary file name as target for a forced rename on Windows. The
target file name is not opened at any time; just renamed into and then
unlinked. Using a temporary instead of a static name is necessary since
otherwise a hg crash can leave the file lying around, blocking future
attempts at renaming.
2009-04-29 09:30:28 +02:00
Patrick Mezard
bd41c37f9b convert/svn: keep latest and not oldest tag value 2009-04-29 21:44:25 +02:00
Martijn Pieters
0a6e43e789 Fix typeerror when specifying both --rebase and --pull 2009-04-29 11:39:49 +02:00
Matt Mackall
ee9ffff851 Merge with crew-stable 2009-04-26 16:49:47 -05:00
Patrick Mezard
ccca7abe8e convert/bzr: make it work with filemaps (issue1631)
The bzr converter maintains a child -> parents mapping and drop entries
whenever a child is read. It does not work with filemaps, getchangedfiles() may
be called more than once when filtered files belong to merge revisions.
getchanges() still works that way but it is not clear whether a similar issue
can arise when interacting with merges.
2009-04-26 11:35:53 +02:00
Martin Geisler
0c9ea24a85 win32text: add copyright header 2009-04-26 01:49:12 +02:00
Martin Geisler
9b64d5d1b3 patchbomb: add copyright and license header 2009-04-26 01:48:53 +02:00
Martin Geisler
e399bbe2aa highlight: add copyright and license header 2009-04-26 01:48:43 +02:00
Martin Geisler
393fa0bd51 convert: add copyright and license headers to back-ends 2009-04-26 01:47:44 +02:00
Patrick Mezard
62eea60737 convert/bzr: fix symlink handling (issue1626) 2009-04-24 10:34:11 +02:00
Matt Mackall
5c870ca09d Merge with crew-stable 2009-04-23 15:25:27 -05:00
Patrick Mezard
75233223fe convert/bzr: handle files replaced by directories (issue1623) 2009-04-23 15:07:05 +02:00
Paul Aurich
e41f434c50 convert/mtn: mtn does not record timezones, mark dates as UTC (issue1624) 2009-04-23 08:45:44 +02:00
Patrick Mezard
f7e8a4c038 convert/mtn: handle directory move into moved directory (issue1619/3) 2009-04-22 10:25:05 +02:00
Patrick Mezard
6bbead8918 convert/mtn: handle files moved in a moved directory (issue1619/2) 2009-04-21 22:31:16 +02:00
Matt Mackall
e612ed45dd Merge with crew-stable 2009-04-21 12:53:06 -05:00
Paul Aurich
477feb0ff9 convert/mtn: handle subsecond commit dates (issue1616) 2009-04-21 15:57:15 +02:00
Patrick Mezard
551e0cf361 convert/mtn: handle new files in moved directories (issue1619)
Reported and investigated by Paul Aurich <paul@darkrain42.org>
2009-04-21 14:17:29 +02:00
Greg Ward
8e956c0016 Reproduce crash where synthetic revs break merge detection (issue1578).
(The fix for this was committed as ca297bc0642d.)

Slightly edited by Patrick Mezard <pmezard@gmail.com>
2009-04-18 13:29:48 -04:00
Patrick Mezard
014b3c7e92 convert/svn: ignore composite tags
Tools like cvs2svn generate tags made of files coming from different revisions
from different branches. This is not supported by Mercurial, and it slows down
the conversion a lot. Ignore them.

See bacula@4082 for a sample.
2009-04-29 21:48:59 +02:00
Patrick Mezard
a623c855d8 Merge with crew-stable 2009-04-29 21:48:15 +02:00
Martijn Pieters
be04752b60 Don't use sed -r; instead use old-style regexp
Rev 428419380b9f introduced some sed -r tests, but -r is only available on GNU
sed, while BSD sed uses -E. Better to use old-style regular expressions, that
way the tests work on all sed variants.
2009-04-28 17:17:54 +02:00
Martijn Pieters
6644fca213 localrepo: Refactor var names in filecommit to improve readability. 2009-04-28 18:14:49 +02:00
Martin Geisler
2a3e72db0b merge with crew-stable
I pushed the 2cf6b93eb5da to crew before realizing that it would also
be suitable for crew-stable, hence the double changeset.
2009-04-29 18:36:55 +02:00
Martijn Pieters
03d5e1ec41 Fix typeerror when specifying both --rebase and --pull 2009-04-29 11:39:49 +02:00
Martin Geisler
02f931ee58 coal, paper: omit unneeded #l1 anchor in links 2009-04-28 23:43:58 +02:00
Martin Geisler
29ac8050fe localrepo: corrected outdated comment 2009-04-28 18:32:15 +02:00
Martin Geisler
3ea1f07ffc localrepo: fixed typos in comments 2009-04-28 18:29:50 +02:00
Martin Geisler
bbf34c8655 help: document nonempty template filter. 2009-04-28 17:30:00 +02:00
Martin Geisler
eee44d410e webcommands: move nonempty logic from JavaScript to Python
This avoids hard-coding the '(none)' string in the JavaScript for each
style and avoids the {nonexisting|nonempty} hack which only works
since the template system don't complain about undefined variables.
2009-04-28 17:28:00 +02:00
Rocco Rutte
0324c58f8b hgweb: use "nonempty" filter in templates for the changelog message
At least subversion allows empty commit logs which, after conversion,
show up as empty fields in hgweb and don't allow selecting the
changeset. Using "nonempty" as filter, "(none)" is used to get
clickable links for empty commit messages.
2009-04-20 12:10:04 +02:00
Rocco Rutte
9aa9232b09 templatefilters: add "nonempty" template filter
It ensures that at least "(none)" is returned in case the argument
passed is None or ''. This is primarily useful to render empty
changelog messages for hgweb but may be useful for others, too.
2009-04-20 11:34:15 +02:00
Patrick Mezard
af0fa1531e keepalive: fix a82d2fe41c70, reintroduce unredirected_hdrs
The previous fix dropped unredirected_hdrs which contain authentication
headers. Removing them break POST request requiring authentication (like
unbundle calls to bitbucket.org).
2009-04-27 22:15:36 +02:00
Martin Geisler
59adad78ff pure/osutil: add copyright and license header 2009-04-26 01:57:12 +02:00
Martin Geisler
cd12c66fa6 match: add copyright and license header 2009-04-26 01:57:00 +02:00
Martin Geisler
f1f94caf9a fancyopts: add copyright and license header 2009-04-26 01:56:52 +02:00
Martin Geisler
539f6e1aac config: add copyright and license header 2009-04-26 01:56:41 +02:00
Martin Geisler
7d509c2459 add blank line after copyright notices and after header 2009-04-26 01:25:53 +02:00
Martin Geisler
2c8901a1b9 turn some comments back into module docstrings 2009-04-26 01:24:49 +02:00
Martin Geisler
8e4bc1e9ad put license and copyright info into comment blocks 2009-04-26 01:13:08 +02:00
Martin Geisler
750183bdad updated license to be explicit about GPL version 2 2009-04-26 01:08:54 +02:00