diff options
author | Maximiliano Curia <maxy@gnuservers.com.ar> | 2015-09-29 16:04:07 +0200 |
---|---|---|
committer | Maximiliano Curia <maxy@gnuservers.com.ar> | 2015-09-29 16:04:07 +0200 |
commit | f5c93dae177971557b81fffd7da14c5fb129a2f1 (patch) | |
tree | 7d2bbd1aa8df4bc40eb45c1a8e1a7f7ea6b66cf9 | |
parent | cfe83a99f4677b4684c894844efbbd5900486b7c (diff) |
Commit Debian 3.0 (quilt) metadata
-rw-r--r-- | debian/patches/clone-fix-parsing-urls-as-repository-loc | 17 | ||||
-rw-r--r-- | debian/patches/fix-typos | 64 | ||||
-rw-r--r-- | debian/patches/issue-fix-creating-issue-without-labels | 23 | ||||
-rw-r--r-- | debian/patches/man-clarify-that-pull-updatecommentclose | 25 | ||||
-rw-r--r-- | debian/patches/man-remove-stray-backtick-character | 17 | ||||
-rw-r--r-- | debian/patches/pass-git_editor-to-sh | 23 | ||||
-rw-r--r-- | debian/patches/series | 7 | ||||
-rw-r--r-- | debian/patches/use-https-urls-where-possible | 74 |
8 files changed, 250 insertions, 0 deletions
diff --git a/debian/patches/clone-fix-parsing-urls-as-repository-loc b/debian/patches/clone-fix-parsing-urls-as-repository-loc new file mode 100644 index 0000000..fcfa016 --- /dev/null +++ b/debian/patches/clone-fix-parsing-urls-as-repository-loc @@ -0,0 +1,17 @@ +Description: clone: Fix parsing URLs as repository locations + Fixes #137 +Author: Jakub Wilk <jwilk@jwilk.net> +X-Dgit-Generated: 0.9.0-2~ cfe83a99f4677b4684c894844efbbd5900486b7c + +--- + +--- git-hub-0.9.0.orig/git-hub ++++ git-hub-0.9.0/git-hub +@@ -761,6 +761,7 @@ class CloneCmd (object): + if upstream.endswith('.git'): upstream = upstream[:-4] + if '/' in upstream: + (owner, proj) = upstream.split('/')[-2:] ++ upstream = '{}/{}'.format(owner, proj) + for repo in req.get('/user/repos'): + if repo['name'] == proj and repo['fork']: + break diff --git a/debian/patches/fix-typos b/debian/patches/fix-typos new file mode 100644 index 0000000..8b36578 --- /dev/null +++ b/debian/patches/fix-typos @@ -0,0 +1,64 @@ +Description: Fix typos +Author: Jakub Wilk <jwilk@jwilk.net> +X-Dgit-Generated: 0.9.0-2~ d7824bed566fc55b3b09930300ab4ce27017c5aa + +--- + +--- git-hub-0.9.0.orig/git-hub ++++ git-hub-0.9.0/git-hub +@@ -172,7 +172,7 @@ GIT_CONFIG_PREFIX = 'hub.' + # This error is thrown when a git command fails (if git prints something in + # stderr, this is considered an error even if the return code is 0). The + # `output` argument is really the stderr output only, the `output` name is +-# preseved because that's how is it called in the parent class. ++# preserved because that's how is it called in the parent class. + class GitError (subprocess.CalledProcessError): + + def __init__(self, returncode, cmd, output): +@@ -774,7 +774,7 @@ class CloneCmd (object): + upstream)) + if not repo['fork']: + warnf('Repository {} is not a fork, just ' +- 'clonning, upstream will not be set', ++ 'cloning, upstream will not be set', + repo['full_name']) + upstream = None + else: +@@ -1525,7 +1525,7 @@ class RebaseCmd (PullUtil): + if args.pull is not None: + if cls.rebasing(): + die("Can't start a pull rebase while a " +- "regular reabase is in progress") ++ "regular rebase is in progress") + cls.start_rebase(args) + else: + args.pull = ongoing_rebase_pull_id +--- git-hub-0.9.0.orig/man.rst ++++ git-hub-0.9.0/man.rst +@@ -278,7 +278,7 @@ COMMANDS + `attach` ISSUE [HEAD] + Convert the issue identified by **ISSUE** to a pull request by attaching + commits to it. The branch (or git ref) where your changes are +- implementedhead can be optionally specified with **HEAD** (otherwise the ++ implemented can be optionally specified with **HEAD** (otherwise the + current branch is used). This subcommand is very similar to the `new` + subcommand, please refer to it for more details. + +@@ -377,7 +377,7 @@ COMMANDS + Passes the **--all** option to stash. Is like + **--stash-include-untracked** but the ignored files are stashed and + cleaned in addition to the untracked files, which completely removes the +- possibility of conflicts when checking out the pull request to reabase. ++ possibility of conflicts when checking out the pull request to rebase. + + \-D, --delete-branch + Delete the pull request branch if the rebase was successful. This is +@@ -426,7 +426,7 @@ from. These are the git config keys used + + `hub.forkrepo` + Your blessed repository fork. The format is *<owner>/<project>*. Used to set +- the head for your pull requests. [defaul: *<username>/(upstream <project> ++ the head for your pull requests. [default: *<username>/(upstream <project> + part)*] + + `hub.forkremote` diff --git a/debian/patches/issue-fix-creating-issue-without-labels b/debian/patches/issue-fix-creating-issue-without-labels new file mode 100644 index 0000000..e49176e --- /dev/null +++ b/debian/patches/issue-fix-creating-issue-without-labels @@ -0,0 +1,23 @@ +Description: issue: Fix creating issue without labels + Set default value of labels to empty list, instead of None which caused: + . + nil is not a array. + HTTP Error 422: Unprocessable Entity + . + Fixes #142. +Author: Jakub Wilk <jwilk@jwilk.net> +X-Dgit-Generated: 0.9.0-2~ 6cf0475c8cc7ba9af71c44a184ecb7067f4047a1 + +--- + +--- git-hub-0.9.0.orig/git-hub ++++ git-hub-0.9.0/git-hub +@@ -1050,7 +1050,7 @@ class IssueCmd (CmdGroup): + "any text after an empty line is used as " + "the optional body" % cls.name) + parser.add_argument('-l', '--label', dest='labels', +- metavar='LABEL', action='append', ++ metavar='LABEL', action='append', default=[], + help="attach LABEL to the %s (can be " + "specified multiple times to set multiple " + "labels)" % cls.name) diff --git a/debian/patches/man-clarify-that-pull-updatecommentclose b/debian/patches/man-clarify-that-pull-updatecommentclose new file mode 100644 index 0000000..df46e80 --- /dev/null +++ b/debian/patches/man-clarify-that-pull-updatecommentclose @@ -0,0 +1,25 @@ +Description: man: clarify that "pull update/comment/close" require an argument. +Author: Jakub Wilk <jwilk@jwilk.net> +X-Dgit-Generated: 0.9.0-2~ 793cfb34d865c2035a3f340c1e2afdcd9e82ab1e + +--- + +--- git-hub-0.9.0.orig/man.rst ++++ git-hub-0.9.0/man.rst +@@ -395,13 +395,13 @@ COMMANDS + \--skip + Skip current patch in an ongoing rebase and continue. + +- `update` ++ `update` PULL + Alias for `issue update`. + +- `comment` ++ `comment` PULL + Alias for `issue comment`. + +- `close` ++ `close` PULL + Alias for `issue close`. + + diff --git a/debian/patches/man-remove-stray-backtick-character b/debian/patches/man-remove-stray-backtick-character new file mode 100644 index 0000000..a6057df --- /dev/null +++ b/debian/patches/man-remove-stray-backtick-character @@ -0,0 +1,17 @@ +Description: man: Remove stray backtick character +Author: Jakub Wilk <jwilk@jwilk.net> +X-Dgit-Generated: 0.9.0-2~ c587259c2499f1677226ab018cb0ea697c4325af + +--- + +--- git-hub-0.9.0.orig/man.rst ++++ git-hub-0.9.0/man.rst +@@ -158,7 +158,7 @@ COMMANDS + Attach `LABEL` to the issue (can be specified multiple times to set + multiple labels). + +- \-a USER, --assign=USER` ++ \-a USER, --assign=USER + Assign an user to the issue. `USER` must be a valid GitHub login name. + + \-M ID, --milestone=ID diff --git a/debian/patches/pass-git_editor-to-sh b/debian/patches/pass-git_editor-to-sh new file mode 100644 index 0000000..fbcdcfd --- /dev/null +++ b/debian/patches/pass-git_editor-to-sh @@ -0,0 +1,23 @@ +Description: Pass GIT_EDITOR to sh + As per git documentation, GIT_EDITOR "is meant to be interpreted by the + shell when it is used". + . + This allows setting GIT_EDITOR to something like "gvim -f". + . + Fixes #139. +Author: Jakub Wilk <jwilk@jwilk.net> +X-Dgit-Generated: 0.9.0-2~ ca8a5135e0e4371ce635f8719e1dde33c367ec3e + +--- + +--- git-hub-0.9.0.orig/git-hub ++++ git-hub-0.9.0/git-hub +@@ -293,7 +293,7 @@ def editor(help_msg, msg=None): + with file(fname, 'w') as f: + f.write(msg or '') + f.write(help_msg) +- status = subprocess.call([prog, fname]) ++ status = subprocess.call([prog + ' "$@"', prog, fname], shell=True) + if status != 0: + die("Editor returned {}, aborting...", status) + with file(fname) as f: diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..27b123a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,7 @@ +fix-typos +man-remove-stray-backtick-character +man-clarify-that-pull-updatecommentclose +issue-fix-creating-issue-without-labels +use-https-urls-where-possible +pass-git_editor-to-sh +clone-fix-parsing-urls-as-repository-loc diff --git a/debian/patches/use-https-urls-where-possible b/debian/patches/use-https-urls-where-possible new file mode 100644 index 0000000..ea7466f --- /dev/null +++ b/debian/patches/use-https-urls-where-possible @@ -0,0 +1,74 @@ +Description: Use HTTPS URLs where possible +Author: Jakub Wilk <jwilk@jwilk.net> +X-Dgit-Generated: 0.9.0-2~ e7ba6bd0f378c41d754e14a6006055bcb4cdecb0 + +--- + +--- git-hub-0.9.0.orig/README.rst ++++ git-hub-0.9.0/README.rst +@@ -26,7 +26,7 @@ Another *unique* feature is the ability + request by attaching commits to it (this is something offered by the `GitHub + API`__ but not by the web interface). + +-__ http://developer.github.com/ ++__ https://developer.github.com/ + + + Usage +@@ -254,12 +254,12 @@ tool I'm sure you already have a GitHub_ + __ https://github.com/sociomantic/git-hub/issues/new + + +-.. _Python: http://www.python.org/ ++.. _Python: https://www.python.org/ + .. _Docutils: http://docutils.sourceforge.net/ +-.. _Git: http://www.git-scm.com/ +-.. _GitHub: http://www.github.com/ ++.. _Git: https://www.git-scm.com/ ++.. _GitHub: https://www.github.com/ + .. _Ubuntu: http://www.ubuntu.com/ +-.. _Debian: http://www.debian.org/ ++.. _Debian: https://www.debian.org/ + .. _VIM: http://www.vim.org/ + .. _FPM: https://github.com/jordansissel/fpm + +--- git-hub-0.9.0.orig/git-hub ++++ git-hub-0.9.0/git-hub +@@ -23,7 +23,7 @@ + # GNU General Public License for more details. + # + # You should have received a copy of the GNU General Public License +-# along with this program. If not, see <http://www.gnu.org/licenses/>. ++# along with this program. If not, see <https://www.gnu.org/licenses/>. + + + """\ +@@ -371,7 +371,7 @@ class Config: + # to use OAuth just leave `basic_auth` and set `oauthtoken`. To fill the + # `basic_auth` member, the `set_basic_auth()` convenient method is provided). + # +-# See http://developer.github.com/ for more details on the GitHub API ++# See https://developer.github.com/ for more details on the GitHub API + class RequestManager: + + basic_auth = None +@@ -493,7 +493,7 @@ def check_empty_message(msg): + message_markdown_help = '''\ + # Remember GitHub will parse comments and descriptions as GitHub + # Flavored Markdown. +-# For details see: http://github.github.com/github-flavored-markdown/ ++# For details see: https://github.github.com/github-flavored-markdown/ + # + # Lines starting with '# ' (note the space after the hash!) will be + # ignored, and an empty message aborts the command. The space after the +--- git-hub-0.9.0.orig/man.rst ++++ git-hub-0.9.0/man.rst +@@ -458,7 +458,7 @@ from. These are the git config keys used + Makes **--triangular** for `clone` if set to "true" (boolean value). See + `clone` documentation for details. + +-[1] http://developer.github.com/v3/pulls/#get-a-single-pull-request ++[1] https://developer.github.com/v3/pulls/#get-a-single-pull-request + + + FILES |