GNOME.org
 

[meld] Remove the 'Add binary' command, used only by CVS

commit a1ae2d91f4ccdefdf5fd25844033c4266b7f7f91
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Dec 31 07:44:23 2011 +1000

    Remove the 'Add binary' command, used only by CVS
    
    CVS servers can be configured with relatively sane defaults, or the
    issue can be dealt with from the command line. This command was taking
    up menu and toolbar space for the benefit of a single, increasingly
    unused version control system.

 data/ui/vcview-ui.xml |    1 -
 meld/vc/_null.py      |    4 +---
 meld/vc/_vc.py        |    2 +-
 meld/vc/bzr.py        |    2 +-
 meld/vc/cvs.py        |    4 +---
 meld/vc/darcs.py      |    2 +-
 meld/vc/fossil.py     |    2 +-
 meld/vc/git.py        |    2 +-
 meld/vc/mercurial.py  |    2 +-
 meld/vc/monotone.py   |    4 +---
 meld/vc/rcs.py        |    2 +-
 meld/vc/svn.py        |    2 +-
 meld/vc/tla.py        |    2 +-
 meld/vcview.py        |    7 ++-----
 14 files changed, 14 insertions(+), 24 deletions(-)
---
diff --git a/data/ui/vcview-ui.xml b/data/ui/vcview-ui.xml
index 2b19784..8d6ed21 100644
--- a/data/ui/vcview-ui.xml
+++ b/data/ui/vcview-ui.xml
@@ -60,7 +60,6 @@
     <menuitem action="OpenExternal" />
     <separator/>
     <menuitem action="VcAdd" />
-    <menuitem action="VcAddBinary" />
     <menuitem action="VcResolved" />
     <menuitem action="VcRemove" />
     <menuitem action="VcRevert" />
diff --git a/meld/vc/_null.py b/meld/vc/_null.py
index 0478fb9..e8e8326 100644
--- a/meld/vc/_null.py
+++ b/meld/vc/_null.py
@@ -35,9 +35,7 @@ class Vc(_vc.Vc):
         return [self.CMD,"diff","-u"]
     def update_command(self):
         return [self.CMD,"update"]
-    def add_command(self, binary=0):
-        if binary:
-            return [self.CMD,"add","-kb"]
+    def add_command(self):
         return [self.CMD,"add"]
     def remove_command(self, force=0):
         return [self.CMD,"rm","-f"]
diff --git a/meld/vc/_vc.py b/meld/vc/_vc.py
index 2fa878d..669cfa7 100644
--- a/meld/vc/_vc.py
+++ b/meld/vc/_vc.py
@@ -99,7 +99,7 @@ class Vc(object):
         raise NotImplementedError()
     def update_command(self):
         raise NotImplementedError()
-    def add_command(self, binary=0):
+    def add_command(self):
         raise NotImplementedError()
     def remove_command(self, force=0):
         raise NotImplementedError()
diff --git a/meld/vc/bzr.py b/meld/vc/bzr.py
index 4ae0c7b..7f9eacb 100644
--- a/meld/vc/bzr.py
+++ b/meld/vc/bzr.py
@@ -64,7 +64,7 @@ class Vc(_vc.CachedVc):
         return [self.CMD] + self.CMDARGS + ["diff"]
     def update_command(self):
         return [self.CMD] + self.CMDARGS + ["pull"]
-    def add_command(self, binary=0):
+    def add_command(self):
         return [self.CMD] + self.CMDARGS + ["add"]
     def remove_command(self, force=0):
         return [self.CMD] + self.CMDARGS + ["rm"]
diff --git a/meld/vc/cvs.py b/meld/vc/cvs.py
index 5da09fe..a1225d9 100644
--- a/meld/vc/cvs.py
+++ b/meld/vc/cvs.py
@@ -48,9 +48,7 @@ class Vc(_vc.Vc):
         return [self.CMD,"diff","-u"]
     def update_command(self):
         return [self.CMD,"update"]
-    def add_command(self, binary=0):
-        if binary:
-            return [self.CMD,"add","-kb"]
+    def add_command(self):
         return [self.CMD,"add"]
     def remove_command(self, force=0):
         return [self.CMD,"rm","-f"]
diff --git a/meld/vc/darcs.py b/meld/vc/darcs.py
index 9974e35..8180215 100644
--- a/meld/vc/darcs.py
+++ b/meld/vc/darcs.py
@@ -56,7 +56,7 @@ class Vc(_vc.CachedVc):
         # This hack allows you to update in the root directory
         return [self.CMD, "pull", "-a", "-p"]
 
-    def add_command(self, binary=0):
+    def add_command(self):
         return [self.CMD, "add"]
 
     def remove_command(self, force=0):
diff --git a/meld/vc/fossil.py b/meld/vc/fossil.py
index 980de21..a3ec112 100644
--- a/meld/vc/fossil.py
+++ b/meld/vc/fossil.py
@@ -53,7 +53,7 @@ class Vc(_vc.CachedVc):
     def update_command(self):
         return [self.CMD, "update"]
 
-    def add_command(self, binary=0):
+    def add_command(self):
         return [self.CMD, "add"]
 
     def remove_command(self, force=0):
diff --git a/meld/vc/git.py b/meld/vc/git.py
index 684aaa5..46327ab 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -68,7 +68,7 @@ class Vc(_vc.CachedVc):
         return [self.CMD, "diff", "--relative", "HEAD"]
     def update_command(self):
         return [self.CMD,"pull"]
-    def add_command(self, binary=0):
+    def add_command(self):
         return [self.CMD,"add"]
     def remove_command(self, force=0):
         return [self.CMD,"rm"]
diff --git a/meld/vc/mercurial.py b/meld/vc/mercurial.py
index 465a7a3..0be1ea2 100644
--- a/meld/vc/mercurial.py
+++ b/meld/vc/mercurial.py
@@ -54,7 +54,7 @@ class Vc(_vc.CachedVc):
         return ret
     def update_command(self):
         return [self.CMD,"update"]
-    def add_command(self, binary=0):
+    def add_command(self):
         return [self.CMD,"add"]
     def remove_command(self, force=0):
         return [self.CMD,"rm"]
diff --git a/meld/vc/monotone.py b/meld/vc/monotone.py
index 899e399..eacf94e 100644
--- a/meld/vc/monotone.py
+++ b/meld/vc/monotone.py
@@ -133,9 +133,7 @@ class Vc(_vc.CachedVc):
         return [self.CMD,"diff"]
     def update_command(self):
         return [self.CMD,"update"]
-    def add_command(self, binary=0):
-        #if binary:
-        #    return [self.CMD,"add","-kb"]
+    def add_command(self):
         return [self.CMD,"add"]
     def remove_command(self, force=0):
         return [self.CMD,"drop"]
diff --git a/meld/vc/rcs.py b/meld/vc/rcs.py
index cd38916..71a0802 100644
--- a/meld/vc/rcs.py
+++ b/meld/vc/rcs.py
@@ -38,7 +38,7 @@ class Vc(_vc.Vc):
     def diff_command(self):
         return ["rcsdiff", "-u"]
 
-    def add_command(self, binary=0):
+    def add_command(self):
         return ["ci", "-l", "-i", "-t-'some file'", "-m'first revision'"]
 
     def _get_dirsandfiles(self, directory, dirs, files):
diff --git a/meld/vc/svn.py b/meld/vc/svn.py
index f1af5e0..df47ea3 100644
--- a/meld/vc/svn.py
+++ b/meld/vc/svn.py
@@ -56,7 +56,7 @@ class Vc(_vc.CachedVc):
 
     def update_command(self):
         return [self.CMD,"update"]
-    def add_command(self, binary=0):
+    def add_command(self):
         return [self.CMD,"add"]
     def remove_command(self, force=0):
         return [self.CMD,"rm","--force"]
diff --git a/meld/vc/tla.py b/meld/vc/tla.py
index b53cac2..5cfe168 100644
--- a/meld/vc/tla.py
+++ b/meld/vc/tla.py
@@ -75,7 +75,7 @@ class Vc(_vc.CachedVc):
     def update_command(self):
         return [self.CMD, "update", "--dir"]
 
-    def add_command(self, binary=0):
+    def add_command(self):
         return [self.CMD, "add-id"]
 
     def remove_command(self, force=0):
diff --git a/meld/vcview.py b/meld/vcview.py
index 1376ae8..deb044f 100644
--- a/meld/vcview.py
+++ b/meld/vcview.py
@@ -104,7 +104,6 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
                          "VcCommit": ("commit_command", ("",)),
                          "VcUpdate": ("update_command", ()),
                          "VcAdd": ("add_command", ()),
-                         "VcAddBinary": ("add_command", ()),
                          "VcResolved": ("resolved_command", ()),
                          "VcRemove": ("remove_command", ()),
                          "VcRevert": ("revert_command", ()),
@@ -127,7 +126,6 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
             ("VcCommit",        "vc-commit-24",             _("Co_mmit"),       None, _("Commit"), self.on_button_commit_clicked),
             ("VcUpdate",        "vc-update-24",             _("_Update"),       None, _("Update"), self.on_button_update_clicked),
             ("VcAdd",           "vc-add-24",                _("_Add"),          None, _("Add to VC"), self.on_button_add_clicked),
-            ("VcAddBinary",     None,                       _("Add _Binary"),   None, _("Add binary to VC"), self.on_button_add_binary_clicked),
             ("VcRemove",        "vc-remove-24",             _("_Remove"),       None, _("Remove from VC"), self.on_button_remove_clicked),
             ("VcResolved",      "vc-resolve-24",            _("_Resolved"),     None, _("Mark as resolved for VC"), self.on_button_resolved_clicked),
             ("VcRevert",        gtk.STOCK_REVERT_TO_SAVED,  None,               None, _("Revert to original"), self.on_button_revert_clicked),
@@ -530,9 +528,8 @@ class VcView(melddoc.MeldDoc, gnomeglade.Component):
         dialog.run()
 
     def on_button_add_clicked(self, obj):
-        self._command_on_selected(self.vc.add_command() )
-    def on_button_add_binary_clicked(self, obj):
-        self._command_on_selected(self.vc.add_command(binary=1))
+        self._command_on_selected(self.vc.add_command())
+
     def on_button_remove_clicked(self, obj):
         self._command_on_selected(self.vc.remove_command())
     def on_button_resolved_clicked(self, obj):
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]