Commit a1ae2d91 authored by Kai Willadsen's avatar Kai Willadsen

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.
parent 0d1c546b
......@@ -60,7 +60,6 @@
<menuitem action="OpenExternal" />
<separator/>
<menuitem action="VcAdd" />
<menuitem action="VcAddBinary" />
<menuitem action="VcResolved" />
<menuitem action="VcRemove" />
<menuitem action="VcRevert" />
......
......@@ -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"]
......
......@@ -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()
......
......@@ -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"]
......
......@@ -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"]
......
......@@ -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):
......
......@@ -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):
......
......@@ -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"]
......
......@@ -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"]
......
......@@ -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"]
......
......@@ -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):
......
......@@ -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"]
......
......@@ -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):
......
......@@ -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):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment