repo.or.cz
/
git-cola.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
models: properly detect merge conflicts with deleted files
2008-11-20
Dav
i
d
Aguilar
model
s
: properly detect merge conflict
s
with deleted
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-20
David
Aguila
r
inotify:
f
i
x a bug introduced when r
e
moving the defaults
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-20
David Aguilar
INSTALL: fix a ty
p
o
in the pyuic4
s
e
ction
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-20
Ba
r
ry Roberts
Simple blame
commit
|
commitdiff
|
tree
2008-11-18
David Aguilar
g
u
i: fix the gui sett
i
ng
s
save/restor
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-18
David Aguil
a
r
main: call git
u
pda
t
e-index
before i
m
porting
the vers
i
on
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-18
Da
v
id Aguilar
g
it
:
make the git m
o
du
l
e in
d
ep
e
ndent of
t
h
e
exceptions
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-18
Dav
i
d A
g
uilar
core
:
assum
e
utf-8 when no other encodings
ar
e
a
ble
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-18
David A
g
ui
l
ar
c
ola:
a
d
d more documentation strings to the
cola modules
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-18
David Aguilar
v
ersion: re
m
ove
the git update-
i
ndex call
t
o
improv
e
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-17
David Agu
i
lar
Makefi
l
e: ad
d
an uni
n
stall
t
a
r
get
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-17
David
Aguilar
INSTALL:
mention
s
o
me build
i
ssues en
c
ountered by user
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-15
David Aguilar
u
nic
o
de: use core
.
encode() and core
.
decode()
t
hrough
o
u
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-15
David Aguilar
c
o
re
:
add a core
module for
h
olding c
o
re encoding r
o
utine
s
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-15
D
a
vid
M
artínez Martí
Gues
s
t
he
correct encoding
fo
r
each diff
line
.
commit
|
commitdiff
|
tree
2008-11-14
D
a
vid
Aguila
r
controllers:
op
t
imize d
e
lete_file
s
by only
c
al
l
i
ng
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-14
Dav
i
d Aguilar
models:
d
o
n
ot list a file in b
o
th the unm
e
rged
a
nd
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-14
David Aguilar
git: ch
e
ck for er
r
no
.
EINTR when handling
i
n
terrupted
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-14
David Aguilar
ui: remove the sortingEn
a
bled pr
o
perty to
a
l
low
qt
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-13
David Aguilar
co
n
text menu: simpl
i
fy the con
t
ext men
u
s
in
t
he right
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-13
David Aguilar
controllers: disab
l
e single and double
-
c
lick staging
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-13
David Ag
u
i
lar
mod
e
ls:
c
lear
o
u
t
the unmerged list wh
e
n che
c
king for
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-13
David Agu
i
lar
contro
l
le
r
s: extend del
e
t
e_f
i
le to del
e
te
multiple
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-13
David Aguilar
views: fix a
b
u
g when selecting an un
t
racked
item
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-13
Barry Roberts
Add "delete" context men
u
to
untracked files
commit
|
commitdiff
|
tree
2008-11-12
David
Aguilar
co
l
a: complet
e
ly r
e
wor
k
th
e
co
l
a user interface
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-12
David Aguilar
view
s
:
a
l
l
ow arbitrary input in the comb
o
b
o
x
and listwidget
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-12
Dav
i
d Aguilar
controllers: import ne
w
merge mess
a
ges if they'r
e
available
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-08
David Aguila
r
m
odels: hand
l
e the git init
c
as
e
in get_workdir_s
t
ate(
)
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-08
Dav
i
d Aguil
a
r
model
s
:
handl
e
t
he
g
it
i
n
it c
a
s
e f
o
r removing staged
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-08
David
A
g
uilar
mode
l
s
:
use symbo
l
ic-ref i
n
stead of
g
it branch in current_
b
r
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-07
D
a
vid
A
guilar
version
:
use the
curre
n
t br
a
nch when
determi
n
in
g
the
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-07
D
a
vid Aguilar
deskto
p
: u
p
dated cola
.
desktop
w
ith the latest
changes
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-05
B
a
rr
y
Ro
b
erts
F
i
x checkou
t
in create branch
commit
|
commitdiff
|
tree
2008-11-05
Davi
d
A
guilar
c
o
ntroll
e
rs/merge
:
ref
o
rmatted code to st
a
y wi
t
hin
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-11-05
B
a
rry Roberts
Disable
Co
m
m
i
t checkbox when S
q
uash is ch
e
cke
d
commit
|
commitdiff
|
tree
2008-11-03
David Aguilar
INST
A
LL:
u
pd
a
t
e
w
i
n32 instructions to mention
the pyu
i
c4
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-31
Da
v
id Agui
l
ar
git-diff
t
ool: don't use "
e
c
h
o
-n"
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-30
David Aguila
r
win32: fix
t
he
utils
.
f
o
rk() implementation for msysgit
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-30
Davi
d
A
g
uilar
u
tils
:
cas
t
to a tuple to prop
e
rly handle the win32
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-30
David Ag
u
ilar
branch
compare:
ad
d
a signal/slot to clo
s
e
t
he branchview
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-30
Da
v
id Aguila
r
g
it
.
py
:
ret
r
y execute() to workaround
inter
r
upted system
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-25
Dav
i
d Aguila
r
darwin: remove darwin fro
m
th
e
use_
s
hell co
n
d
it
i
on
a
l
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-25
D
a
v
i
d A
g
uila
r
win3
2
: do not she
l
l
_
qu
o
te commands
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-25
David
git-cola: a
d
d support for
win32
i
nstallation l
a
y
o
ut
commit
|
commitdiff
|
tree
2008-10-25
D
a
v
i
d
win32:
fix subp
r
ocess
c
ommun
i
cation
commit
|
commitdiff
|
tree
2008-10-24
David
Aguilar
r
e
pobrowser: pas
s
with_raw_
o
utput=True to gi
t
cat-file
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-24
David Agui
l
ar
repobrow
s
er:
fixed bug when
call
i
ng cat_
f
i
l
e
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-24
Da
v
i
d Aguilar
version: use git
.
Git
.
ex
e
cute
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-24
David A
g
uilar
Add
s
elf
.
items(), self
.
iteritems()
,
__iter__
,
and __getitem__
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-24
David
A
guilar
git
.
p
y
: workar
o
un
d
osx
i
n
t
errupted system cal
l
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-23
David
Ag
u
ilar
c
o
m
par
e
: use get_
c
o
rrespo
n
ding_r
e
mot
e
_ref instead of
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-23
D
a
vid Aguilar
mod
e
ls: remove the
n
e
e
d for parameter regist
r
ation
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-22
D
a
vid Agu
i
lar
git-difftool
:
add
a
n
e
w
line after the missin
g
file
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-22
David Aguilar
models: fix u
n
icode ha
n
dling fo
r
config load/save
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-22
Davi
d
Aguil
a
r
model
s
/utils: more u
n
icode fixes
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-22
Da
v
id
Ag
u
i
lar
m
odels: add unicode/i18n suppo
r
t for get_la
t
es
t
_commitmsg()
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-22
Dav
i
d Aguilar
compare: add a BranchC
o
mpareController for use by Branch
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-22
David
A
g
u
ilar
qobserver: ad
d
*_i
t
em, *_selected and *_ind
e
x
for listwidget
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-22
David Aguilar
qobs
e
rver
s
: m
a
ke double
-
click
c
allb
a
c
k
r
e
gistratio
n
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-22
Da
v
i
d Aguilar
m
ain: rew
o
rk the untracked checkbox ha
n
d
l
ing
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-22
David Aguilar
mode
l
s
:
slightl
y
r
e
fac
t
or the
unicode handling
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-22
David Aguilar
view
s
:
add
a
Branc
h
CompareView cl
a
ss
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-22
David Aguilar
models: add get_defau
l
t_remo
t
e() a
n
d
get_correspo
n
ding_remot
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-19
David Ag
u
ila
r
model
s
: some more unicode fix
e
s
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-19
Davi
d
A
g
uil
a
r
gitignore: ad
d
"tags" to
.
gi
t
ignore
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-19
David Aguilar
c
on
t
rollers: refactor fetch/pus
h
/
pull
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-19
David Aguil
a
r
startup:
inst
e
a
d o
f
b
a
iling out
,
prompt for a
git repo
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-19
Da
v
id
Aguilar
git: rework work_tree / git
_
d
ir i
n
i
t
ialization
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-16
David Aguilar
di
f
f
t
ool
launchers: better
be
h
avior when a
m
ending
c
ommits
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-16
Dav
i
d Aguilar
git-difftool: compare
a
g
ainst the index by defaul
t
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-16
David Aguilar
git
-
difftoo
l
:
a
lways sh
o
w
local cha
n
ge
s
in the right
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-14
D
avid Aguilar
git-di
f
f
t
ool:
a
dd a check to make s
u
re we d
o
n
'
t
try
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-14
Davi
d
A
g
uilar
ui: do not pres
e
nt 'undo changes' and 's
t
age changes
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-14
David
A
guil
a
r
m
odels: avoid parsing the outpu
t
o
f
'git
s
tatus'
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-14
D
avid Aguilar
git-difftool: bet
t
er beha
v
ior for unmer
g
ed
f
iles
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-14
Dav
i
d Aguilar
uni
c
ode: refactor
p
ar
s
e_st
a
tus to ce
n
tralize more
code
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-12
Da
v
id
A
g
uilar
cola: i
m
prove un
i
code supp
o
rt
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-11
David Aguilar
com
m
i
t: fix
t
h
e 'st
a
ge changed files to co
m
mit' logic
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-11
David
Agui
l
ar
bra
n
ch compare: do not relaunch di
f
f
t
ool whe
n
using
.
.
.
commit
|
commitdiff
|
tree
2008-10-11
David
A
gu
i
lar
branch compare:
han
d
le double-c
l
ick
s
in the
f
ile list
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-11
David Agui
l
ar
u
i: simpl
i
fy the
'commit'
a
nd
'
br
a
nch' me
n
us by adding
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-11
David Aguilar
compare:
a
d
d
a file icon to
t
he co
m
pare_files list
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-11
David Agu
i
l
ar
compare: restore
l
i
s
t
widget selection when
per
f
orming
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-11
David Agui
l
a
r
c
o
mpa
r
e:
p
re-select the
l
a
test commit diff by default
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-11
D
avid Aguilar
compare: properly
d
isplay r
e
na
m
ed files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-11
David Aguilar
git-difftool:
detect and handle re
n
a
m
ed files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-11
David Aguilar
tests: rename the
g
it ops test
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-11
Barry Ro
b
erts
actions: add 'get
commit me
s
sa
g
e template
'
to the f
i
le
.
.
.
commit
|
commitdiff
|
tree
2008-10-11
Matthew E
.
Levin
e
compare: st
r
e
a
ml
i
ne and improve the comp
a
re commit
s
GUI
commit
|
commitdiff
|
tree
2008-10-11
Da
v
i
d
Aguilar
git-difftool: use empty files for missi
n
g
f
i
les at
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-10
David Aguilar
git-difftoo
l
: handle c
o
mparing n
o
n-existant files
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-10
David Aguilar
git-d
i
fftool: a
d
d a few comm
e
nts explaini
n
g the code
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-10
David Aguilar
git-diff
t
ool: add better clean
u
p handling
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-10
David Aguilar
g
it-di
f
f
tool: never add change
s
to the index
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-10-09
David Aguilar
gui: stream
l
ine th
e
in
t
erface an
d
allow more
i18
n
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-09-26
Dav
i
d Aguil
a
r
Added cola
.
gui to set
u
p
.
py's list of modules
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-09-26
Davi
d
Aguil
a
r
com
p
are:
make the ok
b
utton wo
r
k in the 'c
o
m
p
a
re files
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-09-26
D
avid Aguilar
compare: add a 'Show Versi
o
ns
'
chec
k
b
o
x
t
o
control
.
.
.
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
2008-09-24
Davi
d
A
gu
i
lar
che
c
kout: sh
o
w s
t
derr in case of errors
Signed-off-by:
David Aguilar
<davvid@gmail.com>
commit
|
commitdiff
|
tree
next