Commit Graph

5114 Commits

Author SHA1 Message Date
Patrick Mezard
5c89cb752a patch: handle symlinks without symlinkhunk
Symlink creations and deletions were handled with a special symlinkhunk object,
working like a binary hunk. However, this model does not support symlink
updates or replacements, so we teach regular hunks how to handle symlinks.
2009-10-15 23:15:30 +02:00
Dirkjan Ochtman
2b60214db7 merge with hg-stable 2009-10-10 12:19:58 +02:00
Dirkjan Ochtman
02b4677d86 encoding: fix issue with non-standard UTF-8 CTYPE on OS X 2009-10-10 12:00:43 +02:00
Patrick Mezard
a7d029beb4 patch: do not swallow header-like patch first line (issue1859)
Current solution is hackish but looks like a good trade-off short of rewriting
patch.extract() significantly.
2009-10-08 23:42:33 +02:00
Patrick Mezard
6815e3dc8d windows: fix unlink() not dropping empty tree (issue1861) 2009-10-08 23:32:36 +02:00
Matt Mackall
daf9754427 Merge with -crew-stable 2009-10-07 23:25:41 -05:00
Adrian Buehlmann
692aa6b826 util.rename: do not abort if os.unlink fails (issue1840) 2009-10-06 10:45:23 +02:00
Matt Mackall
721ca9098c Fix for issue1848 2009-10-03 15:57:48 -05:00
Martin Geisler
3e05f2c2a8 ui: guard against UnicodeDecodeErrors in ui.wrap 2009-09-29 01:08:18 +02:00
Martin Geisler
72cc7c5356 util: do not corrupt multi-byte characters in wrap 2009-09-27 01:44:46 +02:00
Sune Foldager
30958eab97 push: fix subtle bug in prepush logic
A test case demonstrating the bug has been added.
Contributed by Henrik Stuart and Sune Foldager.
2009-09-23 18:56:09 +02:00
Sune Foldager
362c2022cc localrepo: fix bugs in branchheads and add docstring
- The call to reverse() reversed the list in place in the global branchmap.
- The nodesbetween function doesn't preserve ordering.
2009-09-23 15:51:36 +02:00
Martin Geisler
af0872c777 dispatch: catch ConfigError while constructing ui 2009-09-19 13:52:54 +02:00
Nicolas Dumazet
7626c98965 config: abort on indented non-continuation lines (issue1829)
Previously, as soon as a continuation would be met, "cont" would stay
forever set to True, but "item" was set back to "None".
This caused the continuation code bits to run every time, until the next
"self.get(section, item) + '\n'" which would crash.
2009-09-12 11:17:07 +02:00
Martin Geisler
eb95e5f9c1 commands: expand -c and -C in update error message 2009-09-17 21:50:12 +02:00
Stuart W Marks
fd1368d11d commands: forbid 'hg update --check --clean' 2009-09-17 21:34:05 +02:00
Steve Borho
68d79882b6 windows: provide filename in IOError exceptions
This brings the Windows posixfile errors in line with the errors
on other platforms.
2009-09-14 19:53:43 -05:00
Patrick Mezard
d68b916da4 merge: exclude common ancestor from --preview (issue1818) 2009-09-05 18:56:51 +02:00
Nicolas Dumazet
9e39f64d52 parsers.c: parse_manifest: fixing refcount of flags
When flags was DECREF'ed, scope was referencing to the outer variable,
outside of the block.
It was in fact always NULL: the real Python object was never decref'ed.
2009-08-27 14:15:04 +02:00
Matt Mackall
c34b180a9c Make distinct lookup error for localrepo.lookup
This allows clone/share to correctly distinguish lookup errors from
corruption errors and catch only the former.
2009-08-31 10:58:33 -05:00
Dirkjan Ochtman
845db1fb2d hgweb: show diff header line in raw diffs 2009-08-26 14:58:09 +02:00
Carey Evans
28b2e6acc5 util: Fix date format for 12-hour time. 2009-08-21 21:52:57 +12:00
Adrian Buehlmann
0a39b63526 dirstate.write: don't ignore stat data if mtime is in the future (issue1790)
This change narrows the race guard that was introduced by ffd022830d6d
("dirstate: ignore stat data for files that were updated too recently")
to not discard the _map entry's stat data if the mtime is in the future.

Without this change, status locks files having odd mtimes in the future
into the 'unset' state, causing needless file compares later (admittedly
harmless), but also inflicting highly irritating sticky effects on
tools/plugins that directly read .hg/dirstate (e.g. TortoiseHg).
2009-08-21 14:17:23 +02:00
Martin Geisler
01be01a4e5 help: show results of all date filters 2009-08-18 13:40:19 +02:00
Martin Geisler
482ea06365 help: document isodatesec and rfc3339 filters (issue1799) 2009-08-18 13:00:13 +02:00
Sebastien Binet
44975f5f1e osutil: fix compilation with -ansi 2009-08-14 11:18:23 +02:00
Matt Mackall
2900a327ba Merge with i18n-stable 2009-08-12 12:06:12 -05:00
Matt Mackall
76ac5743c5 subrepo: add auto-pull for merge 2009-09-30 18:47:33 -05:00
Greg Ward
21961703e5 streamclone: partially encode filename over the wire, not for local read (issue1847)
(Fixes issue1847, which was introduced by 67e6074ba430: stream clone
of a repo with directory named *.d failed: server raises exception
"IOError: [Errno 2] No such file or directory:
/tmp/test/.hg/store/data/foo.d.hg.hg/foo".)
2009-09-30 16:08:11 -04:00
Matt Mackall
ca1c1877e8 Merge with i18n-stable 2009-09-30 13:15:18 -05:00
Martin Geisler
fba2d48279 Merge with main 2009-09-29 00:23:01 +02:00
Greg Ward
b802932aac commands: tweak help for 'heads'.
- prefer "changeset" over "revision" for internal consistency
- clarify explanation of branch heads
- add a line break
- tighten some wording
2009-09-17 18:12:53 -04:00
Steve Borho
c96b2aca86 hook: fix full path imports on Windows (issue1779)
Bottom portion fixes full path imports on source installs on Windows.
The top portion further fixes full path imports on binary installs.

Initial patch by Roman V. Kiseliov
2009-08-05 21:45:54 -05:00
Dan Villiom Podlaski Christiansen
68ad384d38 dispatch: also pass level argument to __import__ for ignored modules
I wanted to check if mercurial.demandimport could speed up the loading of
PyObjC, and ran into this: the level argument for __import__, available in
Python 2.5 and later, is silently dropped when doing an 'import *'. I have no
idea what these arguments mean, but this minor change made it work.

(Oh, and because of that 'from ... import *', PyObjC still took about 2s...)
2009-08-05 17:19:37 +02:00
Dirkjan Ochtman
27d1598185 lsprof: make profile not die when imported modules changes (issue1774) 2009-08-05 14:58:30 +02:00
Stuart W Marks
7e4c51534f help: improve "hg help revisions"
Add info about branch names, and other clarifications.
2009-08-02 19:21:47 -07:00
David Soria Parra
7322d10ac4 email: Catch exceptions during send.
Catch SMTPlib exceptions to avoid mercurial showing a backtrace during
an e.g. authentication error.
2009-07-27 02:27:24 +02:00
Matt Mackall
56469b1da7 update: make a naked except more specific (issue1766) 2009-07-25 19:04:08 -05:00
Bill Barry
5c4fb9e616 fix issue 1763: strip chars from end of line when parsing gitpatch lines 2009-07-24 15:53:40 -06:00
Matt Mackall
4f34600114 heads: more clarity for --closed 2009-07-22 18:27:23 -05:00
Matt Mackall
cfbbab6abc Merge with crew-stable 2009-07-22 18:08:02 -05:00
Matt Mackall
de154bfa34 update: allow -c to jump branches if clean 2009-07-22 17:59:11 -05:00
Matt Mackall
60ca8ea58d subrepo: use '/' for joining non-local paths 2009-07-22 17:53:23 -05:00
Bryan O'Sullivan
9a780e99c8 Fix issue1679: path reconstruction in hgwebdir was mangling things badly 2009-07-22 15:26:27 -07:00
Martin Geisler
a17f0cee1b do not translate commit messages
It is not very helpful to have 'Added tag %s for changeset %s' and
similar messages translated into different languages when people work
together using different locales.

We now use English strings without support for translations. If
needed, the user can still supply a custom string for most commands.
2009-07-22 22:50:34 +02:00
Matt Mackall
5d2bdd955b Merge with crew-stable 2009-07-20 19:15:44 -05:00
James Abbatiello
493895e163 Fix test-demandimport and test-trusted under Windows
The Windows-only wrapper around stdout is causing both of these tests to fail.
test-demandimport fails because it tries to print repr(sys.stdout).  Use
stderr instead since that is not wrapped.

test-trusted fails because the wrapper doesn't handle softspace and an
unexpected extra space gets printed.
2009-07-14 22:38:12 -04:00
Simon Heimberg
3c5d74607b store: eliminate reference cycle in fncachestore
no reference to self in fncacheopener
Inspired by Adrian Buehlmann
2009-07-14 14:05:07 +02:00
Dan Villiom Podlaski Christiansen
dcd26b5a01 commands: hide deprecated commands.
A command is considered deprecated if the word "DEPRECATED" is found
in the doc string. Such commands are hidden from non-verbose help.
2009-07-10 13:40:25 +02:00
Brendan Cully
2c53914f62 Fix issue1738 for strip too.
I see no reason to open every touched file at once.
2009-07-14 17:58:36 -07:00