Commit Graph

12898 Commits

Author SHA1 Message Date
Dan Villiom Podlaski Christiansen
4a1790f181 mq: fix the deprecation comment for qsave & qrestore.
Changeset 1e63d4dee4f6 deprecated qsave and qrestore. In the
deprecating comment, users were referred to 'rebase --mq' which -- at
the time the message was written -- didn't exist. Currently, on the
default branch, rebase *does* take a '--mq' option, but it probably
doesn't do what Dirkjan expected it to do when he wrote the message.

In the original, deprecating commit, little context was provided as to
why this change was made. Based on my recollection, concensus at the
Paris Sprint in February 2010 was that one of the problems with MQ was
that it exposed far too many commands. Notable among these were qsave
& qrestore: very few core developers understood what they did and even
fewer (none, IIRC) actually used them. However, they couldn't be
removed; not only do the usual backwards compatibility reasons apply,
but the hg book refers to them.
2010-09-20 13:31:02 +02:00
Patrick Mezard
979ccf4590 Use lexists() instead of exists() where appropriate 2010-09-20 21:46:56 +02:00
Patrick Mezard
0988572cc6 convert/svn: fix broken symlink renames in svn sink 2010-09-20 21:46:39 +02:00
Patrick Mezard
e043450e1d rename: do not overwrite existing broken symlinks 2010-09-20 21:46:39 +02:00
Patrick Mezard
21f3e10fb9 patch: do not overwrite broken untracked symlinks 2010-09-20 21:42:11 +02:00
Patrick Mezard
2d21e62e9b patch: fix target when patching broken symlinks (issue2368) 2010-09-20 21:42:11 +02:00
Brodie Rao
04db466f58 revset: handle re.compile() errors in grep()
Raise error.ParseError instead of allowing re.error to bubble up.
2010-09-17 10:21:02 -05:00
Martin Geisler
4152cae060 archive: set date to 1980 for very old zip files
The zip file format stores the date using "MS-DOS format" which
apparently means that they use 1980 as their epoch. Python's zipfile
module emits deprecation warnings of this form

  /usr/lib/python2.6/zipfile.py:1108: DeprecationWarning: struct
  integer overflow masking is deprecated
    self.fp.write(zinfo.FileHeader())
  /usr/lib/python2.6/zipfile.py:1108: DeprecationWarning: 'H' format
  requires 0 <= number <= 65535
    self.fp.write(zinfo.FileHeader())
  /home/mg/src/mercurial-crew/mercurial/archival.py:169:
  DeprecationWarning: struct integer overflow masking is deprecated
    self.z.close()
  /home/mg/src/mercurial-crew/mercurial/archival.py:169:
  DeprecationWarning: 'H' format requires 0 <= number <= 65535
    self.z.close()

when it is given such old timestamps. This fixes this by silently
clamping the date to 1980.
2010-09-20 15:33:39 +02:00
Steve Borho
3e9e61ae68 test-eol-update: record new results as correct
Changeset 63043d17c14b changed the result of this test. The 'hg update 0'
command, which causes a merge of modified a.txt, now leaves a.txt in the
EOLN format specified by .hgeol as it was committed in revision 0.

Previously, it used the .hgeol contents from the working directory before the
update.
2010-09-17 12:44:35 -05:00
Matt Mackall
44786dde5f merge with crew 2010-09-16 16:05:00 -05:00
Steve Borho
6c61bc3690 eol: setup the repo.ui in reposetup()
This fixes problems some have reported using the eol extension
together with TortoiseHg.  It ensures the ui associated with the
repository has the preupdate.eol hook configured.
2010-09-15 17:46:51 -05:00
Matt Mackall
920b3bfd15 merge with i18n 2010-09-14 16:20:34 -05:00
Sune Foldager
cd1204adbe color: add win32 support for non-black background
This complicates the code a bit, since attributes need to be masked together
correctly before they are applied. Perhaps the code should be redesigned at
some point, but this works well for now.
2010-09-13 16:12:25 +02:00
Wagner Bruna
2a9331b2f1 i18n-pt_BR: synchronized with f49521594bc2 2010-09-10 21:05:51 -03:00
Martin Geisler
ab7285a5e1 merge with i18n-stable 2010-09-11 00:39:34 +02:00
Christian Ebert
55548a8056 keyword: explain file-wise expansion in help 2010-09-10 16:58:13 +02:00
Brodie Rao
1833e73f70 convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Given a commit author or message with non-ASCII characters in a darcs
repo, convert would raise a UnicodeEncodeError when adding changesets
to the hg changelog.

This happened because etree returns back unicode objects for any text
it can't encode into ASCII. convert was passing these objects to
changelog.add(), which would then attempt encoding.fromlocal() on
them.

This patch ensures converter_source.recode() is called on each piece
of commit data returned by etree.

(Also note that darcs is currently encoding agnostic and will print
out whatever is in a patch's metadata byte-for-byte, even in the XML
changelog.)
2010-09-10 09:30:50 -05:00
Martin Geisler
074f6b21a9 convert: help string cleanups 2010-09-10 00:36:01 +02:00
Martin Geisler
6765286f85 convert: better quoting in help text 2010-09-10 00:30:36 +02:00
Martin Geisler
e1be8b3f05 convert: show example splice, author, and branch map entries in help
Also document that

- empty lines are skipped and comment are supported in author map

- whitespace is not allowed in branch map entries since we split on it
  when parsing the file
2010-09-10 00:22:46 +02:00
Wagner Bruna
5a1881d32f i18n-pt_BR: fix a couple of typos 2010-09-07 18:37:59 -03:00
Wagner Bruna
2022904198 i18n-pt_BR: added messages from crew stable up to c93ef501f756 2010-09-07 18:13:36 -03:00
Thomas Arendsen Hein
48cd219ead verify: fix "missing revlog!" errors for revlog format v0 and add test
With revlog format v0 the .d files are empty if the only revision stored is an
empty file. Since Mercurial can no longer create format v0 repositories, but
still use it, add a script which creates a repository with a single empty file.
This can be used in other tests if wanted.
2010-09-05 22:32:11 +02:00
Mads Kiilerich
953f8baea9 test-convert-cvs: add a sleep to make test more stable
The recent addition of fuzzy tests introduced a new cvs commit which sometimes
fails.

This adds a sleep to make sure that cvs notices that the file has changed,
similar to how it is done in other tests.
2010-09-02 22:38:12 +02:00
Martin Geisler
2dfd084474 bookmarks: break long line found by check-code 2010-09-02 17:07:02 +02:00
Martin Geisler
76b0f88494 help: make "hg help hgrc" an alias for "hg help config" 2010-09-02 12:53:28 +02:00
Martin Geisler
d72c3089ee dagparser: translate and lowercase error messages 2010-08-30 17:17:20 +02:00
Martin Geisler
b9c719086c match: mark error messages for translation 2010-08-30 17:11:51 +02:00
Brodie Rao
16ed03215d remove: properly set return code when warnings are issued
This removes the warn() function in favor of issuing warnings directly
for each kind of file that Mercurial won't remove.

This also uses three separate translatable strings instead of using
string formatting to build the message. This should make it easier to
localize.
2010-08-30 20:27:25 -04:00
Martin Geisler
756848e3f7 pull: lowercase error message 2010-09-01 12:05:57 +02:00
Martin Geisler
24891dc092 mail: use standard section.entry format in error message 2010-08-30 22:47:38 +02:00
Brodie Rao
5a1e1994ac help: refer to user configuration file more consistently
Currently, a number of commands and help topics mention the user hgrc
file in different ways. Among these are following:

1. .hgrc - "please specify your commit editor/username in your .hgrc
file", bookmarks, color, hgk, pager, hg help environment

2. $HOME/.hgrc - hg help paths, hgrc(5), hg(1)

3. ~/.hgrc - hgrc(5)

In addition to being inconsistent, none of these make sense on
Windows. This patch replaces the above with a more general term of
"[your] configuration file".
2010-08-27 22:36:35 -04:00
Pascal Quantin
80eb33b604 win32: add hgweb scripts to Inno Setup installer 2010-08-29 23:16:31 +02:00
Pascal Quantin
be74e290e0 win32: add Emacs scripts to Inno Setup installer 2010-08-29 22:57:24 +02:00
Martin Geisler
bab69a5062 churn: do not crash on malformed lines in alias file 2010-08-29 22:46:00 +02:00
Ronny Pfannschmidt
1a68305741 churn: do not crash on empty lines in alias file 2010-08-29 10:54:22 +02:00
Martin Geisler
5f46f16fb7 Lowercase error messages 2010-08-29 22:37:58 +02:00
Wagner Bruna
27ade2b1fe i18n-pt_BR: synchronized with 3b2ccc533643 2010-08-26 22:38:33 -03:00
Wagner Bruna
a9f899105e i18n: merge with stable 2010-08-26 22:27:20 -03:00
Mads Kiilerich
cd19e3668d mercurial.spec: specify file modes for install 2010-08-26 23:11:03 +02:00
Mads Kiilerich
9876c3e7ec simplemerge: remove hash-bang from non-executable script 2010-08-26 22:51:48 +02:00
Matt Mackall
1d137468dc Added signature for changeset 4d3ecabcbab3 2010-08-26 11:00:46 -05:00
Wagner Bruna
e0d3959c2b i18n-pt_BR: synchronized with 7f905de659f7 2010-08-24 11:01:00 -03:00
Wagner Bruna
20ce77ceda i18n: merge with stable 2010-08-24 10:58:12 -03:00
Matt Mackall
7d97cdbd5f tests: fix up bisect test output 2010-08-21 10:44:57 -05:00
Matt Mackall
395274c87f merge: move reverse-merge logic out of filemerge (issue2342) 2010-08-21 10:41:29 -05:00
Martin Geisler
4e658a8344 i18n: merged stable heads 2010-08-21 11:21:49 +02:00
Wagner Bruna
d9dc537dfd i18n-pt_BR: synchronized with 53eb543142a2 2010-08-20 21:22:57 -03:00
Paolo Giarrusso
c3cff04334 i18n-it: finish translating 'hg summary' output 2010-08-21 00:33:13 +02:00
Paolo Giarrusso
7b94db3f28 i18n-it: remove bogus fuzzy translations for revset
The translations were all random fuzzy strings, which can only do harm, so
remove them.

Moreover, given the status of revset (it seems mostly an internal undocumented module, and
to understand it you need the source anyway), I prefer not to translate it for
now.
2010-08-21 00:33:13 +02:00