[Python-modules-commits] [ropemode] 04/05: merge patched into master
Arnaud Fontaine
arnau at moszumanska.debian.org
Thu Jan 26 04:25:55 UTC 2017
This is an automated email from the git hooks/post-receive script.
arnau pushed a commit to branch master
in repository ropemode.
commit 31127760c9c5ea676792ae3fe12aad28e4ac02a3
Merge: 1a17a28 1530368
Author: Arnaud Fontaine <arnaud.fontaine at nexedi.com>
Date: Thu Jan 26 13:17:52 2017 +0900
merge patched into master
ChangeLog | 12 ++++++++++++
PKG-INFO | 2 +-
debian/.git-dpm | 6 +++---
debian/patches/upstream_changelog.patch | 29 +++++++++++++++++++++--------
ropemode.egg-info/PKG-INFO | 2 +-
ropemode/__init__.py | 2 +-
ropemode/decorators.py | 7 ++++---
7 files changed, 43 insertions(+), 17 deletions(-)
diff --cc debian/.git-dpm
index b126585,0000000..256a8a3
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 7f47defa549a601fda618410a000376ed53db9eb
- 7f47defa549a601fda618410a000376ed53db9eb
- 6d51cc2f199ac2fb5058d9f3186cb3231593fc17
++1530368cc0a1a61b58035afdbafde28a3b119049
++1530368cc0a1a61b58035afdbafde28a3b119049
++a44b3af103439af1a5774880ac33feef4951b610
+a44b3af103439af1a5774880ac33feef4951b610
+ropemode_0.4.orig.tar.gz
+78b2575689768ce9cebb01f1416bd00435c129d7
+12342
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/upstream_changelog.patch
index 5d88803,0000000..6d5dd56
mode 100644,000000..100644
--- a/debian/patches/upstream_changelog.patch
+++ b/debian/patches/upstream_changelog.patch
@@@ -1,459 -1,0 +1,472 @@@
- From 7f47defa549a601fda618410a000376ed53db9eb Mon Sep 17 00:00:00 2001
- From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
- Date: Thu, 8 Oct 2015 13:42:55 -0700
- Subject: upstream_changelog
++From 1530368cc0a1a61b58035afdbafde28a3b119049 Mon Sep 17 00:00:00 2001
++From: Arnaud Fontaine <arnaud.fontaine at nexedi.com>
++Date: Thu, 26 Jan 2017 13:17:01 +0900
++Subject: ChangeLog from upstream Git history
++ (https://github.com/python-rope/ropemode).
+
+Patch-Name: upstream_changelog.patch
+---
- ChangeLog | 442 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 442 insertions(+)
++ ChangeLog | 454 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ 1 file changed, 454 insertions(+)
+ create mode 100644 ChangeLog
+
+diff --git a/ChangeLog b/ChangeLog
+new file mode 100644
- index 0000000..b9d3660
++index 0000000..16fc410
+--- /dev/null
++++ b/ChangeLog
- @@ -0,0 +1,442 @@
++@@ -0,0 +1,454 @@
+++commit 9bd4368fe53103e6cb25d059ca577b262dbfb3e6
+++Author: Matěj Cepl <mcepl at cepl.eu>
+++Date: Sat Dec 31 14:37:09 2016 +0100
+++
+++ New version
+++
+++commit 24bce1a2e31067f5257682ddc725b73eb1ee2a10
+++Author: INADA Naoki <songofacandy at gmail.com>
+++Date: Sun Dec 1 22:33:07 2013 +0100
+++
+++ Fix Python 3 error.
+++
++commit 8b86f9f542685f5b53449215047b83237aaa14b8
++Author: Matěj Cepl <mcepl at cepl.eu>
++Date: Wed Sep 16 12:38:18 2015 +0200
++
++ Upload new version to PyPI
++
++commit 5253a1098556a2a9b8695a97032f2484494fcb79
++Merge: 05263aa 7f8cbf9
++Author: Matěj Cepl <mcepl at cepl.eu>
++Date: Thu Mar 20 22:11:22 2014 +0100
++
++ Merge pull request #10 from digitalrounin/we_moved
++
++ README file pointing people to the new home on GitHub
++
++commit 7f8cbf975b85919cb11e4287a5007325627a82fa
++Author: Pedro <digitalrounin at gmail.com>
++Date: Thu Mar 20 17:56:49 2014 +0700
++
++ README file pointing people to the new home on GitHub
++
++commit 05263aae2f5d9dbae95f3b828ea11271c11600f0
++Merge: ed5b72e 849b16b
++Author: Matěj Cepl <mcepl at cepl.eu>
++Date: Wed Dec 4 15:38:11 2013 -0800
++
++ Merge pull request #9 from mcepl/gitignore
++
++ Add .gitignore.
++
++commit ed5b72e9444c31c9c30753d26f106a21ff2707e8
++Merge: 6ba1153 bc4fc73
++Author: Matěj Cepl <mcepl at cepl.eu>
++Date: Wed Dec 4 08:55:29 2013 -0800
++
++ Merge pull request #7 from mcepl/PR7-theospears-add-location
++
++ Add Location.line_content property to provide context for locations
++
++commit 849b16bfad0e93111cc221ddc0ddb602511a9e3c
++Author: Matěj Cepl <mcepl at redhat.com>
++Date: Tue Dec 3 21:08:42 2013 +0100
++
++ Add .gitignore.
++
++commit bc4fc73894f54102738fbb071d8332b5cefc3836
++Author: Theo Spears <hg at theos.me.uk>
++Date: Sun Dec 1 22:37:31 2013 +0100
++
++ Add Location.line_content property to provide context for locations
++
++ When displaying a list of locations we sometimes want to include
++ the contents of the line the location is on. This provides
++ a propety making that available.
++
++commit 6ba115328a3f4dc1ce05c479acfb4c9bbc35964f
++Author: angri <unknown>
++Date: Mon Sep 17 23:44:33 2012 +0400
++
++ introduced "local_function" decorator, which is similar to local_command,
++ but suppresses exceptions. methods definition_location, get_calltip,
++ get_doc, completions, extended_completions now use it.
++
++ thanks Anton Beloglazov for patch
++
++commit 7feeee2e8449629d7c45245d4fc971e1b5106ca8
++Author: angri <unknown>
++Date: Wed May 16 22:47:03 2012 +0200
++
++ Added tag 0.2 for changeset 61c99582317d
++
++commit f740e6c885c245adce2a512d8c60b74e6d998d39
++Author: angri <unknown>
++Date: Wed May 16 22:46:58 2012 +0200
++
++ version 0.2. now requires rope >= 0.9.4
++
++commit ad0385832189698b647a2ca2065991f425856472
++Author: Leo Liu <sdl.web at gmail.com>
++Date: Wed Feb 8 12:16:43 2012 +0800
++
++ Refactor call_calltip out of show_calltip
++
++commit e1a32aaa1ac1d30803fde2096e782ebfba1b4620
++Author: Ali Gholami Rudi <aligrudi at gmail.com>
++Date: Wed Feb 8 10:37:57 2012 +0800
++
++ Clean up
++
++commit 51c78aabb2e20d9fc530ee6bc155536e204990e9
++Author: Takafumi Arakaki <aka.tkf at gmail.com>
++Date: Mon Feb 6 12:39:36 2012 +0100
++
++ renamed project_is_open to get_project_root
++
++ See the discussion here:
++ http://groups.google.com/group/rope-dev/browse_thread/thread/3c14a6aad228cd70
++
++commit 2d09e00b5e98517acb640eeedb82bccbfe95be1b
++Author: Takafumi Arakaki <aka.tkf at gmail.com>
++Date: Mon Feb 6 09:21:34 2012 +0100
++
++ added rope-project-is-open API
++
++commit 226fc86f6334a9324f5b95c4f5b330f6efd65d8e
++Author: angri <unknown>
++Date: Fri Dec 17 21:50:08 2010 +0300
++
++ new interface method: pop_mark(). Patch by Darren Hoo
++
++commit a597b84aff7d22ed14c01ab3c54a0919fb04d92d
++Author: angri <unknown>
++Date: Mon Jun 21 14:55:04 2010 +0400
++
++ fixed a typo in the variable name in interface.py
++
++commit 00d74e27b1db60cd70fc51f9bfcbf2420cda2f65
++Author: angri <unknown>
++Date: Fri Jun 18 19:46:05 2010 +0400
++
++ add an ability to disable the proposals sorting. patch by Darren Hoo
++
++commit a7f3276f70a0d2828383aa40cbdab7680be9bc29
++Author: Jasper St. Pierre <unknown>
++Date: Fri Apr 30 22:03:24 2010 +0400
++
++ making extended completion available for ropemacs
++
++commit fc6308efeb2f194869abd860d17014d45d945255
++Author: angri <unknown>
++Date: Tue Apr 27 19:53:45 2010 +0400
++
++ always open result of "go to definition" with read-write mode (modifieable)
++
++commit 5468cf75b460101dde3a29294154cfb26251c9e3
++Author: angri <unknown>
++Date: Tue Apr 27 19:50:36 2010 +0400
++
++ open a new buffer for "go to definition" result if the special envvar is set
++
++commit f48aa44b50583cb68c8bb61f6206d827c32b5854
++Author: Darren Hoo <darren.hoo at gmail.com>
++Date: Fri Mar 19 00:13:26 2010 +0300
++
++ ask user before creating new project
++
++commit 25f8025661ba88acc35bb34243ff73594aaa2396
++Author: angri <unknown>
++Date: Wed Feb 3 22:34:27 2010 +0300
++
++ use the same way to pass setuptools-specific parameters to setup() as used in rope
++
++commit 8f2f98b7c0fcfefab0e101532e64de9b3fce7a3e
++Author: angri <unknown>
++Date: Fri Jan 29 00:26:12 2010 +0300
++
++ Added tag 0.1-rc for changeset e75b75d70ac9
++
++commit 3e9e9474a4253cd9a89669cb7898a431f6668605
++Author: angri <unknown>
++Date: Fri Jan 29 00:25:18 2010 +0300
++
++ added setup.py script - ropemode will be a separate package
++
++commit 399f6bcbff82e65f26fa8cc1fd2cb8f2d714fb2d
++Author: angri <unknown>
++Date: Fri Jan 29 00:24:34 2010 +0300
++
++ INFO and VERSION constants in __init__.py like in rope
++
++commit 274b120a34a8b6b61e1e92b553d3dc5497cbd558
++Author: angri <unknown>
++Date: Fri Jan 29 00:04:53 2010 +0300
++
++ added .hgignore file
++
++commit 0931ab6ab7c134aded2f942a0bf83080f559e015
++Author: Fernando H. Silva <unknown>
++Date: Mon Jan 25 16:18:51 2010 -0300
++
++ interface: renamed rope-get-docstring to rope-get-doc
++
++ Renamed rope-get-docstring to rope-get-doc for consistency.
++ Added RopeMode._base_show_doc method to avoid code duplication.
++
++commit fb1d36ea0422dcadd2f268ee029aec6f63b912a5
++Author: Fernando H. Silva <unknown>
++Date: Sun Jan 24 19:22:31 2010 -0300
++
++ interface: added rope-definition-location command
++
++commit 7466813896e3c6f75003bc8b1b6cb9d0e7715d7a
++Author: Fernando H. Silva <unknown>
++Date: Fri Jan 22 17:37:27 2010 -0300
++
++ interface: added rope-get-docstring command
++
++commit ca04d35b0268058880c9b9e375641a5a7127ce06
++Author: angri <unknown>
++Date: Mon Dec 28 02:03:29 2009 +0300
++
++ codeassist: code_assist() should call _completion_data to make extending possible
++
++commit c37cfc181d56d5b8bb67bcb7501b8ac4eac6a747
++Author: angri <unknown>
++Date: Fri Jul 31 00:01:34 2009 +0400
++
++ extended complete: another typo in the same place
++
++commit 5f2c7b2b473c65a2eadc9792078d6de0faf07737
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Wed Jul 29 22:19:02 2009 +0400
++
++ extended complete: fix a typo in autoimport assist
++
++ Reported by: Mike B. <mb1 at buksas.net>
++
++commit bbddd3d6637b69ebc160e54a254ed7722766b266
++Author: Anton Gritsay <general at angri.ru>
++Date: Tue Jul 14 22:37:02 2009 +0400
++
++ allow env to access raw CompletionProposal
++
++ The Environment objects might need to use CompletionProposal directly
++ for obtaining more information about the completion. This patch allows
++ that by adding Environment._completion_data() method.
++
++commit a612035ff3e591e4c1a66c6fec30ed94acc53cf3
++Author: Väinö Järvelä <vaino.jarvela at gmail.com>
++Date: Mon Mar 2 13:51:03 2009 +0330
++
++ fix preview with unicode chars
++
++commit 0ea66ab95c87fb60de05b3f290db43da6565ae97
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Wed Feb 18 19:29:08 2009 +0330
++
++ don't access _CodeAssist.autoimport before opening the project
++
++ Reported by Ben Davis <bendavis78 at gmail.com>.
++
++commit 67d44e3647c5fb302232ef22dd563fe23becc5aa
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Thu Feb 5 20:26:00 2009 +0330
++
++ interface: modules should not be None
++
++ Reported by: glyph <Glyph.Lefkowitz at gmail.com>
++
++commit 94ace9dd42760fc7f796953807f2ca83fa692836
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Thu Dec 18 14:39:36 2008 +0330
++
++ interface: don't included the prefix from completions()
++
++commit 8145016f9291b81c7a81bdcd18e204560ec90eee
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Thu Dec 18 12:32:11 2008 +0330
++
++ interface: use rope.base.utils.cacheit when possible
++
++commit 24acaf0707cd44056d143e7c83fe9bb0d83aa8ce
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Thu Dec 18 11:17:47 2008 +0330
++
++ interface: add rope-completions command
++
++ Requested by Nikolay Panov.
++
++commit 00e33dca49cb6544177b9c084171f671d6d58fa7
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Thu Dec 18 11:16:50 2008 +0330
++
++ decorators: propagate returned value from _exception_handler()
++
++commit 09b97a42fe6d1e9586937f248ebb917d1f8a2f1c
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Wed Oct 29 08:00:59 2008 +0330
++
++ interface: don't fail when using self.resource when no project is open
++
++commit 5057a3c73276c57124a89b57542a0863be1cfdde
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Wed Oct 15 19:26:56 2008 +0330
++
++ don't pass resources that don't exist to code assists
++
++commit 9411d6c570a41370d9e3ab11779e72f07e9512f6
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Fri Jun 20 07:15:24 2008 +0430
++
++ environment: added default parameter to Environment.get()
++
++commit 95bcb6709e4826238b9e15087660929b84e62aad
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Wed Jun 18 22:36:12 2008 +0430
++
++ interface: added guess_project variable
++
++commit 2f11aac02a7fbd48d70646fa5e4119007a2905ea
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Thu Jun 12 17:15:05 2008 +0430
++
++ interface: removed the deprecated show_call_doc command
++
++commit 2d6d718e9fe6de946f159d768f89238e0db60c11
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Sat May 24 14:48:46 2008 +0430
++
++ interface: fixed _save_buffers() when only_current
++
++commit e0192c15750e4a9df255b0c8d4535ccae575ca57
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Sat May 24 13:56:34 2008 +0430
++
++ interface: killing the process when leaving run_module()
++
++commit 65de677774f7ce4638b909b749b63b0927652767
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Sat May 24 13:26:54 2008 +0430
++
++ interface: added run_module local command
++
++commit f2992a1421e1a7a35349001f1de5f308b31e0f6a
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Fri May 23 09:46:28 2008 +0430
++
++ decorators: added Logger.only_short
++
++commit bf205070667df7b526b1eafd71bbcf57700c8bb4
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Thu May 22 14:22:52 2008 +0430
++
++ interface: providing Location.lineno for older versions of rope
++
++commit 52199e5e3b52347eb898d157cd1d5b51a41cef88
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Thu May 22 14:13:18 2008 +0430
++
++ backward compatibility for ChangeSignature.get_args()
++
++commit 65205cbe07a52865b3aecb0de45f26b9b63c3048
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Wed May 21 12:55:32 2008 +0430
++
++ interface: ignoring None from Environment.ask_completion()
++
++commit 4c9f9e8436ed958da7b941a4e249e334f393fdf3
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Mon May 19 18:46:08 2008 +0430
++
++ refactor: using `ChangeSignature.get_args()`
++
++commit 07f1ee35a26bac2a177b4fdf68c5c5d7be97a286
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Mon May 19 09:57:01 2008 +0430
++
++ interface: passing Locations instead tuples to show_occurrences()
++
++commit 0183e0011415d6a96ee8a4a5f7b244b979d724c2
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Sun May 18 19:45:13 2008 +0430
++
++ environment: added Environment.ask_completion()
++
++commit 52dda3840d61715266754a1cac212e5a2f0b2d36
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Sun May 18 19:09:28 2008 +0430
++
++ moved Environment to ropmode.environment
++
++commit 9796b93f74aa1adc3b03265b4db9cfd50ed41480
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Sun May 18 18:52:07 2008 +0430
++
++ interface: removed Environment.askdata
++
++commit 3138b80c9ef3cfcb53d9354bed6365052b026628
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Thu May 15 10:06:49 2008 +0430
++
++ moving out confirm_saving option
++
++commit 61a8db2129ec780d062db6190a1231dfe590d42f
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Thu May 15 10:02:36 2008 +0430
++
++ interface: moved ui related code out of show_doc()
++
++commit a91bb81af639d53346f8e78ce562c4d174a9a926
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Tue May 13 19:51:08 2008 +0430
++
++ dialog: actions are the first entries in base question values
++
++commit e31ba7662e056aac90be5a6c524458c6f35c6a59
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Tue May 13 18:35:34 2008 +0430
++
++ interface: not using emacs names for hooks
++
++commit e1a8f149ab05edc22ceb900df40e0467e63dc846
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Mon May 12 21:44:35 2008 +0430
++
++ added ropemodetest
++
++commit e4561f46cc07c9ccd47f4cfa810b5853b787dfc0
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Mon May 12 18:14:11 2008 +0430
++
++ ropemode: not using emacs style variable names
++
++commit 750c64f5f861dd588e238e70cddc5d0bc0fd2312
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Mon May 12 17:03:23 2008 +0430
++
++ interface: using brackets for printing variable information
++
++commit 7b190057ce3ad75da96df7e6aab72ff067ccb99d
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Mon May 12 15:33:14 2008 +0430
++
++ refactor: moved runtask() to refactor
++
++commit 79de59115998e45322ba1c406d859a541f0f8051
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Mon May 12 15:22:52 2008 +0430
++
++ ropemode: renamed RopeCommon to RopeMode
++
++commit 7aa99196a95590bbdfb7745274109bcba1a65243
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Mon May 12 15:17:32 2008 +0430
++
++ ropemacs: added LispUtils.preview_changes()
++
++commit 02973a9d022267840f1742c228d8e6c0d6dd206f
++Author: Ali Gholami Rudi <aligrudi at users.sourceforge.net>
++Date: Mon May 12 14:34:22 2008 +0430
++
++ ropemode: renamed ropecommon to ropemode
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/ropemode.git
More information about the Python-modules-commits
mailing list