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
David A
g
uilar
m
odels
:
p
r
o
perly de
t
e
ct
m
erge c
o
nflicts with deleted
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-20
David Aguilar
i
n
otify: fix
a bug introduced
w
h
en remo
v
i
ng the default
s
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-20
David Aguila
r
INSTALL
:
fix a typo in the pyuic4 secti
o
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-20
Bar
r
y Robe
r
ts
S
i
m
ple blam
e
commit
|
commitdiff
|
tree
2008-11-18
David Agu
i
lar
g
u
i: fix the gui
s
ettings save/restore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-18
David
A
guilar
m
a
in: ca
l
l git update-index before importing the ver
s
ion
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-18
D
a
vid A
g
uilar
git:
m
ake the git module independent of the
e
xceptions
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-18
D
a
v
id Aguilar
core: as
s
ume utf-8 when
n
o other encodings are a
b
le
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-18
Dav
i
d Aguilar
c
ola: add more
do
c
umen
t
ation strings to th
e
cola
m
odules
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-18
David Aguilar
version:
r
emove the git update-i
n
d
ex cal
l
t
o improve
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-17
Da
v
id A
g
u
i
lar
Makefile: add an u
n
install
t
a
rget
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-17
D
a
vid Aguil
a
r
IN
S
TALL:
m
e
ntion some build
issues encountered by users
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-15
David Agui
l
ar
unicod
e
: use core
.
encode() and
core
.
decod
e
() throughout
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-15
Da
v
id Aguilar
core: add a core module f
o
r holding c
o
r
e encoding routines
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-15
David Ma
r
t
í
nez Martí
Guess
t
he
corre
c
t encoding for e
a
ch diff line
.
commit
|
commitdiff
|
tree
2008-11-14
David
Aguilar
contr
o
llers: optimiz
e
delete_files
b
y
o
n
ly calli
n
g
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-14
D
a
v
i
d Ag
u
ilar
m
o
dels: do not l
i
s
t
a file in both the unmerged and
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-14
D
a
v
i
d Aguila
r
gi
t
:
check
f
or errno
.
EINTR when handl
i
ng interrupted
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-14
David Agui
l
a
r
ui: remove the
sorti
n
g
E
nabled p
r
op
e
rty
t
o
allow
qt
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-13
David Ag
u
ilar
context me
n
u: simp
l
ify
the context menus in t
h
e
r
ig
h
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-13
D
avid Ag
u
ilar
contr
o
l
lers: disa
b
le single and double
-
click staging
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-13
David Agu
i
lar
mo
d
els: clear out the unme
r
ge
d
lis
t
whe
n
checki
n
g
for
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-13
Da
v
id
Aguilar
controllers: ext
e
nd delete_file to delete m
u
ltiple
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-13
David
A
guilar
views: f
i
x a
bug when selec
t
ing an untrac
k
e
d
it
e
m
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-13
Barr
y
Robert
s
A
dd "de
l
ete" c
o
ntex
t
menu
t
o untrack
e
d
f
iles
commit
|
commitdiff
|
tree
2008-11-12
David Agu
i
lar
cola: compl
e
t
e
ly rewor
k
t
h
e
c
ol
a
use
r
interface
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-12
David A
g
u
i
la
r
v
i
ews: al
l
ow arbitrary in
p
ut in
t
he combo
b
ox and listwidg
e
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-12
David Agui
l
ar
con
t
rollers: import
n
e
w merge
messa
g
es if th
e
y
'
r
e
available
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-08
David Aguilar
models:
handle
the git in
i
t case
in get_work
d
i
r
_state()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-08
David
Agu
i
l
a
r
mod
e
ls: handl
e
the git init c
a
se
f
or rem
o
ving
s
taged
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-08
David Aguilar
models: use s
y
mbolic
-
ref i
n
st
e
ad of git branch
i
n curren
t
_br
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-07
D
a
vid
A
guilar
vers
i
on: use the
c
urren
t
branc
h
when determi
n
ing the
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-07
David A
g
uilar
desktop: updated cola
.
desktop w
i
th the latest c
h
a
n
ges
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-05
B
arry Roberts
Fix checkout in
cr
e
a
t
e
b
ranch
commit
|
commitdiff
|
tree
2008-11-05
David Ag
u
ilar
c
o
n
t
rollers/
m
erge:
reformatted
code
to stay with
i
n
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-11-05
B
arry
R
oberts
Disabl
e
Com
m
it checkbox
w
hen Squ
a
sh is checked
commit
|
commitdiff
|
tree
2008-11-03
Dav
i
d
A
gu
i
lar
I
N
STAL
L
:
u
pdate win32 instruction
s
to mention the pyu
i
c4
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-31
Da
v
i
d Agui
l
ar
g
it-dif
f
t
o
ol: don't use "echo -n
"
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-30
D
avid Aguilar
win32: fix the utils
.
fo
r
k() implementat
i
o
n
fo
r
msysgi
t
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-30
David
Agui
l
ar
u
tils:
c
as
t
to a tup
l
e to
properly h
a
ndle the win32
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-30
Da
v
id Aguilar
b
ran
c
h compare: add a signal/slot to close the branchview
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-30
D
a
vid Aguilar
git
.
p
y: retr
y
execute() to workaround int
e
rrupted system
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-25
David A
g
u
i
lar
darwin: remove d
a
rwin
f
rom the use_shell
c
onditional
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-25
David
Aguila
r
win32:
d
o no
t
shell_quo
t
e commands
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-25
David
git-cola: add su
p
p
o
rt for w
i
n32 installat
i
on layout
Signed-off-by: David <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-25
D
a
vid
win
3
2:
fix subpro
c
es
s
com
m
u
ni
c
ati
o
n
Signed-off-by: 'David <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-24
David
A
guilar
repobr
o
wser
:
pass
with_raw_output=T
r
ue to gi
t
c
a
t-file
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-24
Da
v
id A
g
uilar
r
e
pobrowser:
fi
x
ed bug when calling
cat_file
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-24
D
a
v
id Aguilar
ve
r
sion
:
use g
i
t
.
Git
.
execu
t
e
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-24
David Aguilar
A
d
d self
.
items(),
sel
f
.
ite
r
items()
,
_
_
i
ter__, and __
g
e
titem__
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-24
David Aguilar
git
.
py: workaroun
d
osx interrupted system
calls
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-23
David Aguilar
c
ompare: use get_c
o
rrespondin
g
_rem
o
te_ref
i
nstead of
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-23
Da
v
id A
g
uilar
models: remove the need for parameter registr
a
t
i
on
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-22
David Agui
l
a
r
git-d
i
fftoo
l
: add a
n
ewline after the missing file
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-22
David Agui
l
ar
models:
fi
x
unicode h
a
ndling for config
l
oad/save
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-22
David
Agui
l
ar
m
odel
s
/u
t
ils:
m
o
r
e
uni
c
ode fixes
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-22
David Aguilar
models: add unicode/i18n
support
for
g
et_lat
e
st_commitmsg()
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-22
David Aguila
r
c
o
mpare: ad
d
a
B
ranchCompare
C
ontroller f
o
r use by Br
a
n
ch
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-22
D
a
vi
d
Aguilar
qobserver: add *_item, *_se
l
ected and *_i
n
d
e
x for listwidget
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-22
D
a
vid Ag
u
i
lar
qobservers: make dou
b
le-cl
i
ck
c
a
l
lback
r
egistration
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-22
David
A
gui
l
ar
main: re
w
ork the unt
r
acke
d
checkbox handling
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-22
David Aguilar
m
odels
:
s
li
g
htly r
e
factor
the unicode
handl
i
ng
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-22
Davi
d
Aguilar
v
iews: add a BranchCompar
e
View class
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-22
Da
v
id Aguilar
models: add get_defau
l
t_remote() a
n
d get_corresponding_rem
o
t
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-19
David Aguila
r
mo
d
e
ls: some more unicode fixes
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-19
D
a
v
id Aguilar
gitignore:
a
dd "
t
a
gs" to
.
gitignore
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-19
Davi
d
Aguilar
co
n
trollers
:
r
e
f
a
ct
o
r fetch/push/p
u
ll
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-19
Da
v
id Aguilar
startup: inste
a
d of bailing out, p
r
ompt for
a git repo
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-19
David Aguilar
git: r
e
work wo
r
k
_tree / git_dir in
i
tialization
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-16
David
Aguilar
difftool
l
auncher
s
: be
t
ter
behavi
o
r when amending
commits
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-16
D
a
v
i
d Agu
i
la
r
git-difftool: compare against the index by
default
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-16
Davi
d
Ag
u
ilar
git-diffto
o
l
:
always show
l
ocal chan
g
e
s in t
h
e r
i
ght
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-14
David Agu
i
lar
git-d
i
fftool: ad
d
a
check t
o
make s
u
r
e
w
e
don
'
t
t
ry
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-14
David Aguilar
ui: do not present
'
u
n
do
c
hanges' and
'
s
t
age chan
g
es
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-14
David Aguilar
mod
e
ls: avoi
d
p
arsin
g
the output of '
g
it status'
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-14
David Aguil
a
r
git-di
f
ftool
:
better behavior for unmerg
e
d fil
e
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-14
David A
g
uilar
unic
o
de: refactor par
s
e_s
t
atus t
o
central
i
ze more code
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-12
David
A
g
uilar
c
ola
:
improve
u
n
icode support
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-11
Da
v
id Aguilar
commit:
fi
x
the
'
stage
c
h
a
n
g
e
d file
s
to commit' logic
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-11
Dav
i
d Aguilar
branch co
m
pare: do not relaunch diffto
o
l wh
e
n using
.
.
.
commit
|
commitdiff
|
tree
2008-10-11
David Aguila
r
branch c
o
mpare:
h
an
d
le do
u
ble-cli
c
k
s
in
t
he file list
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-11
David Aguilar
ui: simplif
y
the 'com
m
it' and 'br
a
nc
h
' menus
by
a
dding
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-11
Da
v
id
A
g
u
ilar
com
p
are: a
d
d a file icon
to
t
he c
o
mpa
r
e_fil
e
s l
i
st
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-11
Dav
i
d Ag
u
ilar
c
ompa
r
e: restore listwidget selection when
performing
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-11
D
a
v
id A
g
uila
r
compare: pr
e
-selec
t
t
h
e
l
a
test commi
t
diff by default
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-11
D
avi
d
Aguilar
compar
e
: pro
p
erly d
i
splay renamed file
s
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-11
D
a
vid Ag
u
i
l
a
r
git-
d
ifftool: detect and ha
n
dle re
n
amed
fi
l
es
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-11
David Aguilar
tests:
r
en
a
me the gi
t
ops test
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-11
Ba
r
r
y R
o
ber
t
s
a
c
tion
s
: add 'get commit message templa
t
e' to
t
he file
.
.
.
commit
|
commitdiff
|
tree
2008-10-11
Matth
e
w E
.
Levine
compare: streamlin
e
a
nd imp
r
ove the compa
r
e
c
ommits GUI
commit
|
commitdiff
|
tree
2008-10-11
David Aguilar
git-difft
o
ol
:
use empty
f
i
les for missing files at
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-10
David Aguilar
git-difft
o
o
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 Agui
l
ar
git-
d
ifftool: add a few c
o
mments expl
a
i
n
ing the code
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-10
David Aguilar
git-difftool:
a
dd better cl
e
anup h
a
ndling
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-10
David Agui
l
ar
g
i
t-difftool:
n
ever
add
change
s
to the index
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-10-09
David Aguilar
gui:
s
t
ream
l
i
n
e the i
n
terface and allow m
o
re
i
1
8
n
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-09-26
David
A
gu
i
lar
Added
c
ola
.
gui t
o
setup
.
py's list
of modules
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-09-26
David Aguilar
c
omp
a
re:
make t
h
e ok button work
in the 'com
p
are fi
l
es
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-09-26
David Aguilar
compare:
a
dd a 'Show Versions' checkbox
to control
.
.
.
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
2008-09-24
David
A
guilar
chec
k
ou
t
: show stderr
i
n case of
e
rrors
Signed-off-by: David Aguilar <
davvid@gmail.com
>
commit
|
commitdiff
|
tree
next