Commits

Show all
Author Commit Message Labels Comments Date
Yuya Nishihara
update: correct default behavior of updating to bookmark to 'prompt' The settings dialog and 80726e76c25c says 'prompt' is the default.
Tags
2.6.1
Branches
stable
Yuya Nishihara
copypatch: support internal lossless export/import via clipboard (fixes #841) Because the patch content is not always unicode-safe, we'd better avoid encoding conversion.
Branches
stable
Yuya Nishihara
hgignore: use util.expandpath() to expand env vars of ui.ignore (fixes #2306) Mercurial core behaves that way: http://selenic.com/repo/hg/diff/d78fe60f6bda/mercurial/dirstate.py
Branches
stable
Yuya Nishihara
bookmark: use canonical command name, "bookmarks" If ui.strict is True, unknown command error occurs. Thanks to Katsunori FUJIWARA <flying.foozy@gmail.com>.
Branches
stable
Wagner Bruna
i18n: pull latest cs, de and ja translations from Launchpad
Branches
stable
Yuya Nishihara
merge: refresh csinfo of commit page so that it can show two parents Because mergeCsInfo is instantiated before merging, commit page happens to show stale dirstate, which has one parent.
Branches
stable
Yuya Nishihara
docs: bump version to 2.6
Branches
stable
Yuya Nishihara
sync: use the same tooltip messages as workbench toolbar buttons
Branches
stable
Sergej Zagursky
rejects: earlybytes fix (fixes #2295)
Branches
stable
Wagner Bruna
i18n: pull latest translations from Launchpad Including messages up to 35febb954904 .
Branches
stable
Yuya Nishihara
manifestdialog: fix possible unicode error at cset link handler (fixes #2289) If 'unknown branch' message is translated, UnicodeDecodeError occurs. Also changed to call ManifestWidget.setRev() with integer revision or None, because it looks to be designed as such.
Branches
stable
Angel Ezquerra
resolve: normalize paths before calling resolve This fixes a problem where the resolve command could silently fail when the path separators do not match the OS standard path separator. This happened because some external merge tools are not able to open the file unless the path separators are correct.
Branches
stable
Yuya Nishihara
repotreeitem: remove unused shortnameChanged signal from RepoItem As RepoItem is an ordinary python object, pyqtSignal would never be usable.
Branches
stable
Yuya Nishihara
reporegistry: actually restore the current repository entry after model reload After setModel(), the original _activeTabRepo is invalid. Instead, it can use the repository path to identify the originally-active entry.
Branches
stable
Yuya Nishihara
reporegistory: restore original behavior of setActiveTabRepo('') (fixes #2279) Backed out changeset f06d377cc564. setActiveTabRepo(''), which is called when all repos are closed, should switch off the current active flag.
Branches
stable
Yuya Nishihara
repofilter: use case-sensitive completion for revsets (fixes #2276) Qt doc says: > By default, for an editable combo box, a QCompleter that performs case > insensitive inline completion is automatically created.
Branches
stable
Yuya Nishihara
copypatch: have dummy Writable object acts like a string (fixes #2280) Since Mercurial 2.4, output (=template) parameter must be string [1]. We can simply pass output='' for 2.4, but Mercurial 2.3 still requires dummy file-like object. As a workaround, this implements len(writable), so that it can bypass `len(template) > 0` of cmdutil.export(). I'll write another patch for default branch, which should take away dummy Writable hack. [1]: http://www.selenic.com/repo…
Branches
stable
Yuya Nishihara
rename: actually overwrite existing file if requested Without -f, the dialog asks "overwirte it?" but actually does nothing. As we manually check existing file, this adds -f permanently.
Branches
stable
Yuya Nishihara
wctxactions: use RenameDialog for copy action
Branches
stable
Yuya Nishihara
rename: move check of command name out of RenameDialog RenameDialog should be usable without the knowledge of command-line.
Branches
stable
Angel Ezquerra
merge: let the user change the commit options on the merge wizard commit page (fixes #1727) An "options" button has been added to the "commit panel". This button opens the same "Options dialog" that is shown when you click the "Options" button on the commit widget. If some commit option is set, it will be shown on the commit panel as well, and the options will be taken into account when making the commit.
Branches
stable
Angel Ezquerra
commit: hide the 'autoinc' option when merging It is not possible to "autoinclude" files in merge commits. Hide the corresponding commit option on the commit options dialog and on the "selected options" label.
Branches
stable
Angel Ezquerra
commit: refactor code that reads and displays the current options The code that reads the current repository options and displays it has been refactored into its own functions. This is necessary to be able to reuse this code from the commit panel of the merge dialog (which will be done on a separate, future patch).
Branches
stable
Yuya Nishihara
resolve: separate resolve and diff actions of unresolved context menu
Branches
stable
Yuya Nishihara
resolve: simplify connection of doubleClicked signal
Branches
stable
ike....@gmail.com
resolve: add doubleclick actions in resolve window (fixes #2236) Resolved files tree: double click an item performs a "Diff to Local" Unresolved files tree: double click an item performs - "Mercurial Resolve" when "Auto-resolve merges" is not checked in settings - "Tool Resolve" when "Auto-resolve merges" is checked in settings
Branches
stable
ike....@gmail.com
resolve: add "diff to common ancestor" cmenu actions in resolve window (fixes #2201) In the resolve window 2 contextmenu actions have been added for unresolved files "Diff Local to Ancestor": shows the diff between local and the common ancestor "Diff Other to Ancestor": shows the diff between other and the common ancestor
Branches
stable
Steve Borho
workbench: pushes new branch without failing if --pushafter set (fixes #1986) Patch submitted by Ian Kemp (ian.kemp@krs.co.za)
Branches
stable
Johan Samyn
settings: completed helptext for 'Diff and Annotate' -> 'MQ Git Format'
Branches
stable
Angel Ezquerra
merge: make sure that there is no default button on the Commit page This emphasizes the fact that "Commit Now" is not the preferred workflow. It may be even better to make the "Commit Later" button the default, but that may not be easy given that that button corresponds to the "Cancel" button on the wizard page.
Branches
stable
  1. Prev
  2. Next