- Nov 01, 2013
-
-
Matt Mackall authored
-
Wagner Bruna authored
-
- Oct 31, 2013
-
-
Wagner Bruna authored
-
- Oct 30, 2013
-
-
Katsunori FUJIWARA authored
-
- Oct 13, 2013
-
-
Johan Bjork authored
This is arguably a workaround, a better fix may be in the repo to ensure that it won't list a file 'modified' unless there is a file context for the previous version.
-
- Oct 26, 2013
-
-
Katsunori FUJIWARA authored
-
Katsunori FUJIWARA authored
-
- Nov 01, 2013
-
-
Katsunori FUJIWARA authored
Fix test-check-pyflakes.t error after 1d7a36ff2615. This patch replaces "readshelvedfiles()" invocation by "shelvedfile().exists()" check and aborting, because it is required only to ensure that shelved changes corresponded to specified name exist after invocation. This patch also remove definition of "readshelvedfiles()" itself, because it is invoked only from the line removed by this patch.
-
- Oct 30, 2013
-
-
Pierre-Yves David authored
Prior this changeset, rebasing a merge whose first parent was not in the rebase lead to wrong and highly conflicting merge. See the in-line comment for details. Test have been updated with the data provided by the reported.
-
- Oct 29, 2013
-
-
Pavlos Touboulidis authored
-
- Oct 28, 2013
-
-
Mads Kiilerich authored
Prompts like foo has been turned into a largefile use (l)argefile or keep as (n)ormal file? was not as clear as the usual prompts that use 'remote' or 'local' to explain what happened on which side ... especially not when used to the normal prompts. "as" could also indicate that it would be possible to take the content of the largefile and somehow put it into the normal file. It could make it more clear that it was a choice between one side or the other. For consistency we will now phrase it like: remote turned local normal file f into a largefile use (l)argefile or keep (n)ormal file?
-
Mads Kiilerich authored
427ce5633c1c fixed one problem with update and added a test case for it. The test coverage was thus insufficient before that. To make sure we have good test coverage in this area we add systematic testing of all cases of merges that may or may not change normal files to largefiles or vice versa. The tests shows some annoying extra merge prompts in some cases, but these prompts are hard to avoid and they are now "safe" - they do not leave the system in a confused inconsistent state.
-
- Oct 23, 2013
-
-
Mads Kiilerich authored
-
- Oct 28, 2013
-
-
Katsunori FUJIWARA authored
This patch removes code paths in "shelvedfile.opener()", because: - explicit "vfs.mkdir()" invocation is useless "vfs.__call__()" for modes other than "read" creates parent directory of target file automatically by "util.ensuredirs()". - mode checking in "except IOError" code path is useless ENOENT occurs only for "read" mode, because target file is created forcibly for other modes. - there is no explicit "return" statement in the code path for "except IOError" if "mode[0] in 'wa'" this is incorrect, because None may be returnd unexpectedly, even though it seems the EEXIST case in the directory creation race for ".hg/shelved" and is very rare. this directory creation race is also treated in "util.ensuredirs()".
-
Katsunori FUJIWARA authored
Before this patch, commit is allowed even while unshelve is in progress. In the other hand, "hg unshelve --abort" and "hg unshelve --continue" check whether parent revisions of the working directory have changed or not since last "hg unshelve", and abort without clearing state for unshelve in progress if they have. This causes that accidental commit makes clearing state for unshelve difficult in ordinary ways. This patch disallows commit while unshelve is in progress for consistency.
-
- Oct 30, 2013
-
-
Matt Mackall authored
-
- Oct 23, 2013
-
-
Durham Goode authored
Previously, shelve used merge to unshelve things. This meant that if you shelved changes on one branch, then unshelved on another, all the changes from the first branch would be present in the second branch, and not just the shelved changes. The fix is to use rebase to pick the shelve commit off the original branch and place it on top of the new branch. This means only the shelved changes are brought across. This has the side effect of fixing several other issues in shelve: - you can now unshelve into a file that already has pending changes - unshelve a mv/cp now has the correct dirstate value (A instead of M) - you can now unshelve to an ancestor of the shelve - unshelve now no longer deletes untracked .orig files Updates tests and adds a new one to cover the issue. The test changes fall into a few categories: - I removed some excess output - The --continue/--abort state is a little different, so the parents and dirstate needed updating - Removed some untracked files at certain points that cluttered the output
-
- Oct 24, 2013
-
-
Katsunori FUJIWARA authored
>From the table without header text of 1st column, docutils generates the table with fully empty header row.
-
Katsunori FUJIWARA authored
On Windows, only double quotation mark can quote command line arguments. So, this patch uses double quotation mark to quote command line arguments in all examples of online help document.
-
Katsunori FUJIWARA authored
-
Takumi IINO authored
-
- Oct 23, 2013
-
-
Mads Kiilerich authored
-
- Oct 24, 2013
-
-
Mads Kiilerich authored
-
Mads Kiilerich authored
We used to get like: $ hg up -r 2 foo has been turned into a normal file keep as (l)argefile or use (n)ormal file? l getting changed largefiles 0 largefiles updated, 0 removed 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ cat foo cat: foo: No such file or directory [1] - which both asked the wrong question and did the wrong thing. Instead, skip this conflict resolution when the local conflicting file has been scheduled for removal and there thus is no conflict.
-
Mads Kiilerich authored
-
Mads Kiilerich authored
-
- Oct 23, 2013
-
-
Mads Kiilerich authored
-
- Oct 17, 2013
-
-
Mads Kiilerich authored
-
- Oct 23, 2013
-
-
Mads Kiilerich authored
-
- Oct 21, 2013
-
-
Mads Kiilerich authored
-
- Oct 23, 2013
-
-
Mads Kiilerich authored
Warnings should always end with \n. The warning message might contain or end with \n, so better show it with repr encoding.
-
- Oct 21, 2013
-
-
Pascal Quantin authored
-
Javi Merino authored
-
- Oct 22, 2013
-
-
Yuya Nishihara authored
Problem occurs if "hg cat -o" is invoked more than once in the same process. The output of "hg cat" will be appended because of modemap[fn] = 'ab'.
-
Takumi IINO authored
revertfiles are relative to the repository root. not paths relative to the cwd.
-
- Oct 21, 2013
-
-
Matt Mackall authored
-
Matt Mackall authored
-
- Oct 13, 2013
-
-
David Soria Parra authored
If paging is configured for a command all it's internal defined aliases will be paged as well. This will make attend=log cause 'hg history' to run the pager. However custom aliases will not be paged by default.
-
- Oct 20, 2013
-
-
Matt Mackall authored
-
Matt Mackall authored
-